Merge branch 'stable' of https://github.com/LibrIT/passhport into stable

LibrIT · Oct 11, 2019 · 1cd4d5d · 1cd4d5d
2 parents dbdff8a + 9edcfaa
commit 1cd4d5d
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/passhportd/app/models_mod/usergroup.py b/passhportd/app/models_mod/usergroup.py
@@ -351,12 +351,14 @@ def accessible_target_list(self, checked_usergroups = [], mode="string"):
                 accessible_targets.append(target)
 
         # 2. list all targets accessible through usergroups
-        for usergroup in self.gmembers:
+        for usergroup in self.containedin:
             if usergroup not in checked_usergroups:
                 checked_usergroups.append(usergroup)
-                for target in usergroup.accessible_target_list(checked_usergroups):
-                    if target not in self.targets:
+                for target in usergroup.accessible_target_list(
+                                         checked_usergroups, mode="obj"):
+                    if target not in accessible_targets:
                         if mode == "string":
+                            print(target)
                             accessible_targets.append(target.name)
                         else:
                             accessible_targets.append(target)