Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2025-11-07 05:45:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replaced depreciated admin.type with ACLManager

Browse Source
This commit is contained in:
jetchirag
2019-02-03 17:19:20 +05:30
committed by GitHub
parent 9c983fe04b
commit 095fa6743b
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
dockerManager/decorators.py
View File

@@ -6,16 +6,17 @@ import json
from django.http import HttpResponse from django.http import HttpResponse
from loginSystem.views import loadLoginPage from loginSystem.views import loadLoginPage
from plogical.CyberCPLogFileWriter import CyberCPLogFileWriter as logging from plogical.CyberCPLogFileWriter import CyberCPLogFileWriter as logging
from plogical.acl import ACLManager
def preDockerRun(function): def preDockerRun(function):
def wrap(request, *args, **kwargs): def wrap(request, *args, **kwargs):
try: try:
val = request.session['userID'] userID = request.session['userID']
except KeyError: except KeyError:
return redirect(loadLoginPage) return redirect(loadLoginPage)
admin = Administrator.objects.get(pk=val) currentACL = ACLManager.loadedACL(userID)
if request.method == "POST": if request.method == "POST":
isPost = True isPost = True
@@ -30,7 +31,7 @@ def preDockerRun(function):
json_data = json.dumps(data_ret) json_data = json.dumps(data_ret)
return HttpResponse(json_data) return HttpResponse(json_data)
else: else:
return render(request, 'dockerManager/install.html', {'status':admin.type, 'conErr':0}) return render(request, 'dockerManager/install.html', {'status':currentACL['admin'], 'conErr':0})
# Check if docker is running and we are able to connect # Check if docker is running and we are able to connect
@@ -44,7 +45,7 @@ def preDockerRun(function):
json_data = json.dumps(data_ret) json_data = json.dumps(data_ret)
return HttpResponse(json_data) return HttpResponse(json_data)
else: else:
return render(request, 'dockerManager/install.html', {'status':admin.type, 'conErr':1}) return render(request, 'dockerManager/install.html', {'status':currentACL['admin'], 'conErr':1})
return function(request, *args, **kwargs) return function(request, *args, **kwargs)