feat: more permissive child support

hivesolutions · Feb 25, 2021 · 6c06b12 · 6c06b12
1 parent 084970a
commit 6c06b12
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/appier_extras/parts/admin/models/account.py b/src/appier_extras/parts/admin/models/account.py
@@ -702,6 +702,8 @@ def tokens(self):
             tokens.update(["base", "user"])
 
         for role in self.roles_l:
+            if not hasattr(role, "tokens_a"): continue
+            if not role.tokens_a: continue
             tokens.update(role.tokens_a)
 
         if "*" in tokens: tokens = ["*"]

diff --git a/src/appier_extras/parts/admin/models/role.py b/src/appier_extras/parts/admin/models/role.py
@@ -121,6 +121,8 @@ def view_m(self, context = None):
     def tokens_a(self):
         tokens = set(self.tokens)
         for child in self.children:
+            if not hasattr(child, "tokens_a"): continue
+            if not child.tokens_a: continue
             tokens.update(child.tokens_a)
         return tokens