From 3e6e140e9975119936bc9faf53cd7d55cc0d2f85 Mon Sep 17 00:00:00 2001 From: Michael McGrath Date: Thu, 13 Mar 2008 12:35:39 -0500 Subject: [PATCH] Add role_type --- fas/fas/group.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fas/fas/group.py b/fas/fas/group.py index d3dd91b..bef1d75 100644 --- a/fas/fas/group.py +++ b/fas/fas/group.py @@ -252,13 +252,13 @@ class Group(controllers.Controller): re_search = re.sub(r'\*', r'%', search).lower() results = Groups.query.filter(Groups.name.like(re_search)).order_by('name').all() if self.jsonRequest(): - membersql = sqlalchemy.select([PersonRoles.c.person_id, PersonRoles.c.group_id], PersonRoles.c.role_status=='approved').order_by(PersonRoles.c.group_id) + membersql = sqlalchemy.select([PersonRoles.c.person_id, PersonRoles.c.group_id, PersonRoles.c.role_type], PersonRoles.c.role_status=='approved').order_by(PersonRoles.c.group_id) members = membersql.execute() for member in members: try: - memberships[member[1]].append(member[0]) + memberships[member[1]].append({'person_id': member[0], 'role_type': member[2]}) except KeyError: - memberships[member[1]]=[member[0]] + memberships[member[1]]=[{'person_id': member[0], 'role_type': member[2]}] for group in results: if canViewGroup(person, group): groups.append(group)