From c07c1237fe6ac32b1f78d472bccbce9d3844d3d1 Mon Sep 17 00:00:00 2001 From: Michael McGrath Date: Mon, 10 Mar 2008 19:18:58 -0500 Subject: [PATCH] cleanup --- fas/fas/group.py | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/fas/fas/group.py b/fas/fas/group.py index 48e2474..fe7932f 100644 --- a/fas/fas/group.py +++ b/fas/fas/group.py @@ -254,9 +254,9 @@ class Group(controllers.Controller): groups = [] re_search = re.sub(r'\*', r'%', search).lower() results = Groups.query.filter(Groups.name.like(re_search)).order_by('name').all() -# memberships = session.query(PersonRoles).order_by(PersonRoles.sponsor_id).all() - membersql = sqlalchemy.select([PersonRoles.c.person_id, PersonRoles.c.group_id]).order_by(PersonRoles.c.group_id) - members = membersql.execute() + if self.jsonRequest(): + membersql = sqlalchemy.select([PersonRoles.c.person_id, PersonRoles.c.group_id]).order_by(PersonRoles.c.group_id) + members = membersql.execute() for member in members: try: memberships[member[1]].append(member[0]) @@ -265,14 +265,6 @@ class Group(controllers.Controller): for group in results: if canViewGroup(person, group): groups.append(group) -# if self.jsonRequest(): - # Adds efficiency - #grp_members = session.query(Groups).filter_by(name=group.name).all() -# grp_members = session.query(PersonRoles).filter_by(group_id=group.id).all() -# memberships[group.name] = [] -# for member in grp_members: -# memberships[group.name].append({'person_id': member.person_id}) -# memberships[group.name] = group.approved_roles if not len(groups): turbogears.flash(_("No Groups found matching '%s'") % search) return dict(groups=groups, search=search, memberships=memberships)