Skip to content

Commit f9eda7b

Browse files
committed
bug fix: suspend user
1 parent c9dc4f0 commit f9eda7b

3 files changed

Lines changed: 2 additions & 4 deletions

File tree

ftp/ftpManager.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,9 @@
1313
import plogical.CyberCPLogFileWriter as logging
1414
from loginSystem.views import loadLoginPage
1515
from websiteFunctions.models import Websites
16-
from plogical.virtualHostUtilities import virtualHostUtilities
1716
from plogical.ftpUtilities import FTPUtilities
1817
import os
1918
from plogical.acl import ACLManager
20-
from plogical.processUtilities import ProcessUtilities
2119

2220
class FTPManager:
2321
def __init__(self, request):

userManagment/userManager.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def run(self):
2828

2929
def controlUserState(self):
3030
try:
31-
websites = ACLManager.findAllSites(self.extraArgs['currentACL'],self.extraArgs['user'])
31+
websites = ACLManager.findAllSites(self.extraArgs['currentACL'],self.extraArgs['user'].pk)
3232
from websiteFunctions.website import WebsiteManager
3333

3434
wm = WebsiteManager()

userManagment/views.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1053,7 +1053,7 @@ def controlUserState(request):
10531053

10541054
extraArgs = {}
10551055
extraArgs['user'] = user
1056-
extraArgs['currentACL'] = currentACL
1056+
extraArgs['currentACL'] = ACLManager.loadedACL(user.pk)
10571057
extraArgs['state'] = state
10581058

10591059
from userManagment.userManager import UserManager

0 commit comments

Comments
 (0)