Infrastructure/fedora-infrastructure
1
0
Fork 0
Code Issues 70 Pull requests Projects Releases Packages Wiki Activity Actions

cleanup

Browse source
This commit is contained in:
Michael McGrath 2008-03-10 19:18:58 -05:00
parent 072f622876
commit c07c1237fe
1 changed files with 3 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
fas/fas/group.py
View file

@ -254,9 +254,9 @@ class Group(controllers.Controller):
groups = [] groups = []
re_search = re.sub(r'\*', r'%', search).lower() re_search = re.sub(r'\*', r'%', search).lower()
results = Groups.query.filter(Groups.name.like(re_search)).order_by('name').all() results = Groups.query.filter(Groups.name.like(re_search)).order_by('name').all()
# memberships = session.query(PersonRoles).order_by(PersonRoles.sponsor_id).all() if self.jsonRequest():
membersql = sqlalchemy.select([PersonRoles.c.person_id, PersonRoles.c.group_id]).order_by(PersonRoles.c.group_id) membersql = sqlalchemy.select([PersonRoles.c.person_id, PersonRoles.c.group_id]).order_by(PersonRoles.c.group_id)
members = membersql.execute() members = membersql.execute()
for member in members: for member in members:
try: try:
memberships[member[1]].append(member[0]) memberships[member[1]].append(member[0])
@ -265,14 +265,6 @@ class Group(controllers.Controller):
for group in results: for group in results:
if canViewGroup(person, group): if canViewGroup(person, group):
groups.append(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): if not len(groups):
turbogears.flash(_("No Groups found matching '%s'") % search) turbogears.flash(_("No Groups found matching '%s'") % search)
return dict(groups=groups, search=search, memberships=memberships) return dict(groups=groups, search=search, memberships=memberships)