Add role_type
This commit is contained in:
parent
4aa8ef5973
commit
3e6e140e99
1 changed files with 3 additions and 3 deletions
|
@ -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)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue