Fix group dump and SSL cert generation.

This commit is contained in:
Ricky Zhou (周家杰) 2008-03-04 21:21:59 -05:00
parent 45491e3372
commit 2ab83d37b3
4 changed files with 6 additions and 6 deletions

View file

@ -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())

View file

@ -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)

View file

@ -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

View file

@ -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')