From 2ab83d37b3e760d49ccacb87958caa008cbccd01 Mon Sep 17 00:00:00 2001
From: Ricky Zhou <ricky@fedoraproject.org>
Date: Tue, 4 Mar 2008 21:21:59 -0500
Subject: [PATCH] Fix group dump and SSL cert generation.

---
 fas/fas/group.py                 | 2 +-
 fas/fas/openid_fas.py            | 2 +-
 fas/fas/templates/group/dump.txt | 4 ++--
 fas/fas/user.py                  | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/fas/fas/group.py b/fas/fas/group.py
index fa27c3d..780d6b6 100644
--- a/fas/fas/group.py
+++ b/fas/fas/group.py
@@ -470,7 +470,7 @@ into the e-mail aliases within an hour.
             turbogears.redirect('/group/list')
             return dict()
         else:
-            return dict(groups=groups)
+            return dict(group=group)
 
     @identity.require(identity.not_anonymous())
     @validate(validators=GroupInvite())
diff --git a/fas/fas/openid_fas.py b/fas/fas/openid_fas.py
index e3d6635..f9ca8c7 100644
--- a/fas/fas/openid_fas.py
+++ b/fas/fas/openid_fas.py
@@ -106,7 +106,7 @@ class OpenID(controllers.Controller):
     @validate(validators=UserID())
     def id(self, username):
         '''The "real" OpenID URL'''
-        person = Person.by_username(username)
+        person = People.by_username(username)
         server = config.get('base_url') + turbogears.url('/openid/server')
         return dict(person=person, server=server)
 
diff --git a/fas/fas/templates/group/dump.txt b/fas/fas/templates/group/dump.txt
index fb68b9a..5922563 100644
--- a/fas/fas/templates/group/dump.txt
+++ b/fas/fas/templates/group/dump.txt
@@ -1,3 +1,3 @@
-#for user in sorted(groups.keys())
-${user},${Person.byUserName(user).mail},${Person.byUserName(user).givenName},${groups[user].fedoraRoleType}
+#for role in sorted(group.approved_roles)
+${role.member.username},${role.member.emails['primary'].email},${role.member.human_name},${role.role_type}
 #end
diff --git a/fas/fas/user.py b/fas/fas/user.py
index 9af9875..5c84a98 100644
--- a/fas/fas/user.py
+++ b/fas/fas/user.py
@@ -431,7 +431,7 @@ Please go to https://admin.fedoraproject.org/fas/ to change it.
     def gencert(self):
       from fas.openssl_fas import *
       username = turbogears.identity.current.user_name
-      person = Person.by_username(username)
+      person = People.by_username(username)
 
       person.certificate_serial = person.certificate_serial + 1
 
@@ -451,7 +451,7 @@ Please go to https://admin.fedoraproject.org/fas/ to change it.
           O=config.get('openssl_o'),
           OU=config.get('openssl_ou'),
           CN=user.cn,
-          emailAddress=person.mail,
+          emailAddress=person.emails['primary'].email,
           )
 
       cert = createCertificate(req, (cacert, cakey), person.certificate_serial, (0, expire), digest='md5')