From 1f1546b159332aff868972b5aa914b3bb809ef84 Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Wed, 26 Jan 2022 13:10:53 +0500 Subject: [PATCH] bug fix: child domain records --- plogical/acl.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/plogical/acl.py b/plogical/acl.py index c0f2b04b4..5374659c7 100644 --- a/plogical/acl.py +++ b/plogical/acl.py @@ -595,12 +595,18 @@ def findAllDomains(currentACL, userID): domains = Websites.objects.all().order_by('domain') for items in domains: domainsList.append(items.domain) + + for childs in items.childdomains_set.all(): + domainsList.append(childs.domain) + else: admin = Administrator.objects.get(pk=userID) domains = admin.websites_set.all().order_by('domain') for items in domains: domainsList.append(items.domain) + for childs in items.childdomains_set.all(): + domainsList.append(childs.domain) admins = Administrator.objects.filter(owner=admin.pk) @@ -608,6 +614,8 @@ def findAllDomains(currentACL, userID): doms = items.websites_set.all().order_by('domain') for dom in doms: domainsList.append(dom.domain) + for childs in items.childdomains_set.all(): + domainsList.append(childs.domain) return domainsList @@ -679,7 +687,11 @@ def checkGDriveOwnership(gD, admin, currentACL): @staticmethod def checkOwnershipZone(domain, admin, currentACL): - domain = Websites.objects.get(domain=domain) + try: + domain = Websites.objects.get(domain=domain) + except: + domain = ChildDomains.objects.get(domain=domain) + domain = domain.master if currentACL['admin'] == 1: return 1