bug fix: child domain records

usmannasir · Jan 26, 2022 · 1f1546b · 1f1546b
1 parent c10c3b7
commit 1f1546b
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/plogical/acl.py b/plogical/acl.py
@@ -595,19 +595,27 @@ 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)
 
             for items in admins:
                 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