Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2025-11-13 16:56:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug fix: child domain records

Browse Source
This commit is contained in:
Usman Nasir
2022-01-26 13:10:53 +05:00
parent c10c3b7861
commit 1f1546b159
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plogical/acl.py
View File

@@ -595,12 +595,18 @@ class ACLManager:
domains = Websites.objects.all().order_by('domain') domains = Websites.objects.all().order_by('domain')
for items in domains: for items in domains:
domainsList.append(items.domain) domainsList.append(items.domain)
for childs in items.childdomains_set.all():
domainsList.append(childs.domain)
else: else:
admin = Administrator.objects.get(pk=userID) admin = Administrator.objects.get(pk=userID)
domains = admin.websites_set.all().order_by('domain') domains = admin.websites_set.all().order_by('domain')
for items in domains: for items in domains:
domainsList.append(items.domain) domainsList.append(items.domain)
for childs in items.childdomains_set.all():
domainsList.append(childs.domain)
admins = Administrator.objects.filter(owner=admin.pk) admins = Administrator.objects.filter(owner=admin.pk)
@@ -608,6 +614,8 @@ class ACLManager:
doms = items.websites_set.all().order_by('domain') doms = items.websites_set.all().order_by('domain')
for dom in doms: for dom in doms:
domainsList.append(dom.domain) domainsList.append(dom.domain)
for childs in items.childdomains_set.all():
domainsList.append(childs.domain)
return domainsList return domainsList
@@ -679,7 +687,11 @@ class ACLManager:
@staticmethod @staticmethod
def checkOwnershipZone(domain, admin, currentACL): def checkOwnershipZone(domain, admin, currentACL):
try:
domain = Websites.objects.get(domain=domain) domain = Websites.objects.get(domain=domain)
except:
domain = ChildDomains.objects.get(domain=domain)
domain = domain.master
if currentACL['admin'] == 1: if currentACL['admin'] == 1:
return 1 return 1