From 4aa8ef5973323c24c2117a569b971a67efcda52e Mon Sep 17 00:00:00 2001 From: Michael McGrath Date: Thu, 13 Mar 2008 11:34:09 -0500 Subject: [PATCH] this is a nasty hack but will work for now. --- fas/fas/group.py | 20 ++++++++++++-------- fas/fas/templates/group/dump.txt | 4 ++-- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/fas/fas/group.py b/fas/fas/group.py index acb84e8..d3dd91b 100644 --- a/fas/fas/group.py +++ b/fas/fas/group.py @@ -471,15 +471,19 @@ into the e-mail aliases within an hour. username = turbogears.identity.current.user_name person = People.by_username(username) if not groupname: - groupname = config.get('cla_done_group') - group = Groups.by_name(groupname) - - if not canViewGroup(person, group): - turbogears.flash(_("You cannot view '%s'") % group.name) - turbogears.redirect('/group/list') - return dict() +# groupname = config.get('cla_done_group') + people = People.query.order_by('username').all() else: - return dict(group=group) + people = [] + groups = Groups.by_name(groupname) + for role in groups.approved_roles: + people.append(role.member) + if not canViewGroup(person, groups): + turbogears.flash(_("You cannot view '%s'") % group.name) + turbogears.redirect('/group/list') + return dict() + + return dict(people=people) @identity.require(identity.not_anonymous()) @validate(validators=GroupInvite()) diff --git a/fas/fas/templates/group/dump.txt b/fas/fas/templates/group/dump.txt index d417d81..7219bd4 100644 --- a/fas/fas/templates/group/dump.txt +++ b/fas/fas/templates/group/dump.txt @@ -1,3 +1,3 @@ -#for role in sorted(group.approved_roles) -${role.member.username},${role.member.email},${role.member.human_name},${role.role_type},0 +#for person in sorted(people) +${person.username},${person.email},${person.human_name},user,0 #end