diff --git a/dockerManager/container.py b/dockerManager/container.py index 13a600571..67b20a098 100755 --- a/dockerManager/container.py +++ b/dockerManager/container.py @@ -719,8 +719,6 @@ class ContainerManager(multi.Thread): def images(self, request=None, userID=None, data=None): try: admin = Administrator.objects.get(pk=userID) - if admin.acl.adminStatus != 1: - return ACLManager.loadError() client = docker.from_env() dockerAPI = docker.APIClient() @@ -768,12 +766,6 @@ class ContainerManager(multi.Thread): def manageImages(self, request=None, userID=None, data=None): try: - currentACL = ACLManager.loadedACL(userID) - - if currentACL['admin'] == 1: - pass - else: - return ACLManager.loadError() client = docker.from_env() dockerAPI = docker.APIClient() diff --git a/dockerManager/views.py b/dockerManager/views.py index 69ae1fafb..f2f3259d1 100755 --- a/dockerManager/views.py +++ b/dockerManager/views.py @@ -177,13 +177,6 @@ def runContainer(request): def listContainers(request): try: userID = request.session['userID'] - currentACL = ACLManager.loadedACL(userID) - - if currentACL['admin'] == 1: - pass - else: - return ACLManager.loadErrorJson() - cm = ContainerManager() return cm.listContainers(request, userID) except KeyError: @@ -375,13 +368,6 @@ def images(request): try: userID = request.session['userID'] - currentACL = ACLManager.loadedACL(userID) - - if currentACL['admin'] == 1: - pass - else: - return ACLManager.loadErrorJson() - cm = ContainerManager() coreResult = cm.images(request, userID) @@ -393,16 +379,8 @@ def images(request): def manageImages(request): try: userID = request.session['userID'] - currentACL = ACLManager.loadedACL(userID) - - if currentACL['admin'] == 1: - pass - else: - return ACLManager.loadErrorJson() - cm = ContainerManager() coreResult = cm.manageImages(request, userID) - return coreResult except KeyError: return redirect(loadLoginPage)