diff --git a/ftp/ftpManager.py b/ftp/ftpManager.py index 274b12117..c57cc421d 100755 --- a/ftp/ftpManager.py +++ b/ftp/ftpManager.py @@ -13,11 +13,9 @@ from loginSystem.models import Administrator import plogical.CyberCPLogFileWriter as logging from loginSystem.views import loadLoginPage from websiteFunctions.models import Websites -from plogical.virtualHostUtilities import virtualHostUtilities from plogical.ftpUtilities import FTPUtilities import os from plogical.acl import ACLManager -from plogical.processUtilities import ProcessUtilities class FTPManager: def __init__(self, request): diff --git a/userManagment/userManager.py b/userManagment/userManager.py index bc6c87115..44858cf0d 100644 --- a/userManagment/userManager.py +++ b/userManagment/userManager.py @@ -28,7 +28,7 @@ class UserManager(multi.Thread): def controlUserState(self): try: - websites = ACLManager.findAllSites(self.extraArgs['currentACL'],self.extraArgs['user']) + websites = ACLManager.findAllSites(self.extraArgs['currentACL'],self.extraArgs['user'].pk) from websiteFunctions.website import WebsiteManager wm = WebsiteManager() diff --git a/userManagment/views.py b/userManagment/views.py index 667198f53..3f37f5bc7 100755 --- a/userManagment/views.py +++ b/userManagment/views.py @@ -1053,7 +1053,7 @@ def controlUserState(request): extraArgs = {} extraArgs['user'] = user - extraArgs['currentACL'] = currentACL + extraArgs['currentACL'] = ACLManager.loadedACL(user.pk) extraArgs['state'] = state from userManagment.userManager import UserManager