From 427da23a318b4c0ad024ddac28d4a53765f8dab6 Mon Sep 17 00:00:00 2001 From: Aguay-val Date: Thu, 27 Jun 2019 16:41:32 +0200 Subject: [PATCH] fix(models_mod/targetgroup.py): Fix simplejson def --- passhportd/app/models_mod/targetgroup.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/passhportd/app/models_mod/targetgroup.py b/passhportd/app/models_mod/targetgroup.py index 2a34cd86..429af200 100644 --- a/passhportd/app/models_mod/targetgroup.py +++ b/passhportd/app/models_mod/targetgroup.py @@ -79,7 +79,7 @@ def simplejson(self): output = "{\n" output = output + "\"Name\": \"" + format(self.name) + "\",\n" - output = output + "\"Comment\": \"" + format(self.comment) + "\",\n" + output = output + "\"Comment\": \"" + format(self.comment) + "\"\n" output = output + "}" return output @@ -109,7 +109,7 @@ def prepare_delete(self): self.tgadmins.pop() return self - + # User management def is_members(self, user): @@ -288,7 +288,7 @@ def accessible_target_list(self, parsed_targetgroups = None, style="object"): style = "object"): if target not in targets: targets.append(target) - # Return target objects or names depending of the style + # Return target objects or names depending of the style if style == "names": targetnames = [] for target in targets: @@ -386,7 +386,7 @@ def addtargetgroup(self, targetgroup): """Add a targetgroup to the relaton table""" if not self.is_tgmembers(targetgroup) and not self == targetgroup: self.tgmembers.append(targetgroup) - else: + else: return False return self @@ -410,7 +410,7 @@ def memberof(self, obj): members.append(targetgroup) else: return "Error in object type" - + ret = "[" for m in members: ret = ret + m.name + "," @@ -456,11 +456,11 @@ def all_targetgroupname_list(self, parsed_targetgroups = None): return targetgroupnames def show_targets(self, indentation): - """Return a formated list of the targets that the targetgroup + """Return a formated list of the targets that the targetgroup provides """ listing = [] - + indent = "" for i in range(indentation): indent = indent + " "