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

fix further minor issues in cloudlinux

Browse Source
This commit is contained in:
Usman Nasir
2020-12-17 14:20:54 +05:00
parent 46ea3766aa
commit e36b6b8a6a
3 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
CLScript/CloudLinuxUsers.py
View File

@@ -92,7 +92,12 @@ class CloudLinuxUsers(CLMain):
user['username'] = webs.externalApp
if self.ow:
user['owner'] = webs.admin.userName
if webs.admin.owner == 1:
user['owner'] = webs.admin.userName
else:
from loginSystem.models import Administrator
oAdmin = Administrator.objects.get(pk=webs.admin.owner)
user['owner'] = oAdmin.userName
if self.domain:
user['domain'] = webs.domain
@@ -133,7 +138,11 @@ class CloudLinuxUsers(CLMain):
if self.owner == None:
websites = Websites.objects.all()
else:
websites = Websites.objects.filter(admin__userName=self.owner)
from loginSystem.models import Administrator
from plogical.acl import ACLManager
oAdmin = Administrator.objects.get(userName=self.owner)
currentACL = ACLManager.loadedACL(oAdmin.pk)
websites = ACLManager.findWebsiteObjects(currentACL, oAdmin.pk)
if self.username != None:
websites = websites.filter(externalApp=self.username)