Merge pull request #213 from elg/master

Error listing access obtain by usergroups via targetgroups

passhportd/app/models_mod/targetgroup/__init__.py

@@ -215,7 +215,7 @@ def accessible_target_list(self, parsed_targetgroups = None, style="object"):
 
     def all_targetname_list(self, parsed_targetgroups = None):
         """Return a list with all the targets of this targetgroup"""
-        return accessible_target_list(parsed_targetgroups, style="names")
+        return self.accessible_target_list(parsed_targetgroups, style="names")
 
 
     # Usergroup management

passhportd/app/models_mod/usergroup/__init__.py

@@ -37,6 +37,7 @@ class Usergroup(db.Model):
     # Relations
     members = db.relationship("User", secondary="group_user")
     targets = db.relationship("Target", secondary="target_group")
+    tgmembers = db.relationship("Targetgroup", secondary="tgroup_group")
     gmembers = db.relationship(
         "Usergroup",
         secondary=group_of_group,
@@ -248,6 +249,7 @@ def list_direct_usergroups(self):
 
         return usergroups
 
+
     def accessible_target_list(self, checked_usergroups = []):
         """Return all the targets this usergroups give access to"""
         accessible_targets = []
@@ -265,8 +267,15 @@ def accessible_target_list(self, checked_usergroups = []):
                     if target not in self.targets:
                         accessible_targets.append(target)
 
+        # 3. list all the target accessible through targetgroups
+        for targetgroup in self.tgmembers:
+            for target in targetgroup.accessible_target_list():
+                if target not in self.targets:
+                    accessible_targets.append(target)
+
         return accessible_targets
 
+
     def show_targets(self, indentation):
         """Return all targets the group gives access
         First the targets with this group attached