fedora-accounts dump-group.cgi,1.5,1.6

[Toshio Ernie Kuratomi (toshio)]

Author: toshio

Update of /cvs/fedora/fedora-accounts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv561

Modified Files:
	dump-group.cgi 
Log Message:
Retrieve people not in any group as well when called with no group.



Index: dump-group.cgi
===================================================================
RCS file: /cvs/fedora/fedora-accounts/dump-group.cgi,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dump-group.cgi	17 Aug 2007 19:36:01 -0000	1.5
+++ dump-group.cgi	20 Aug 2007 22:45:40 -0000	1.6
@@ -22,15 +22,20 @@
 print "Content-type: text/%s\n" % fmt
 
 dbc = dbh.cursor()
-qry = """
+qargs = []
+if groupname:
+    qry = """
 SELECT distinct person.username, person.email, person.human_name, role.role_type, person.id, role.project_group_id
 FROM role, person, project_group WHERE person.id = role.person_id AND project_group.id = role.project_group_id
 AND person.approval_status = 'approved' AND role.role_status = 'approved'
+AND project_group.name = %s
 """
-qargs = []
-if groupname:
-    qry += """ AND project_group.name = %s """
     qargs.append(groupname)
+else:
+    qry = """
+SELECT distinct person.username, person.email, person.human_name, Null, person.id, Null
+FROM person WHERE person.approval_status = 'approved'
+"""
 
 if form.has_key('role_type'):
     rt = form['role_type'].value