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

Merge branch 'master' of ssh://git.fedoraproject.org/git/hosted/fedora-infrastructure

Browse source
This commit is contained in:
Ricky Zhou (周家杰) 2007-09-05 14:52:01 -07:00
commit d745482ec1
3 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

18
fas/fas/templates/user/view.html
View file

@ -13,15 +13,15 @@
<h3>Account Details <a href="${tg.url('/user/edit/%s' % user.cn)}" py:if="personal or admin">(edit)</a></h3>
<div class="userbox">
<dl>
<dt>Account Name</dt><dd>${user.cn}</dd>
<dt>Real Name</dt><dd>${user.givenName}</dd>
<dt>Email</dt><dd>${user.mail}</dd>
<dt>Bugzilla Email</dt><dd>${user.fedoraPersonBugzillaMail}</dd>
<dt>IRC Nick</dt><dd>${user.fedoraPersonIrcNick}</dd>
<dt>PGP Key</dt><dd>${user.fedoraPersonKeyId}</dd>
<dt>Telephone Number</dt><dd>${user.telephoneNumber}</dd>
<dt>Postal Address</dt><dd>${user.postalAddress}</dd>
<dt>Description</dt><dd>${user.description}</dd>
<dt>Account Name</dt><dd>${user.cn}&nbsp;</dd>
<dt>Real Name</dt><dd>${user.givenName}&nbsp;</dd>
<dt>Email</dt><dd>${user.mail}&nbsp;</dd>
<dt>Bugzilla Email</dt><dd>${user.fedoraPersonBugzillaMail}&nbsp;</dd>
<dt>IRC Nick</dt><dd>${user.fedoraPersonIrcNick}&nbsp;</dd>
<dt>PGP Key</dt><dd>${user.fedoraPersonKeyId}&nbsp;</dd>
<dt>Telephone Number</dt><dd>${user.telephoneNumber}&nbsp;</dd>
<dt>Postal Address</dt><dd>${user.postalAddress}&nbsp;</dd>
<dt>Description</dt><dd>${user.description}&nbsp;</dd>
<dt>Password</dt><dd><span class="approved">Valid</span> <a href="${tg.url('/user/changepass')}" py:if="personal">(change)</a></dd>
<dt>Account Status</dt><dd><span class="approved">Approved</span>, Active</dd>
<dt>CLA</dt><dd><span py:if="claDone" class="approved">Done</span><span py:if="not claDone" class="unapproved"> Not Done</span></dd>

7
fas/fas/user.py
View file

@ -163,7 +163,7 @@ class User(controllers.Controller):
user.__setattr__('postalAddress', postalAddress.encode('utf8'))
user.__setattr__('description', description.encode('utf8'))
except:
turbogears.flash(_('Your account details could not be saved.'))
turbogears.flash(_('Your account details could not be saved.'))
return dict()
else:
turbogears.flash(_('Your account details have been saved.'))
@ -279,8 +279,9 @@ class User(controllers.Controller):
try:
p.__setattr__('userPassword', newpass['hash'])
turbogears.flash(_('Your new password has been emailed to you.'))
turbogears.redirect('/login')
except: #TODO: This may be too strong and show up even if it worked.
# This is causing an exception which causes the password could not be reset error.
# turbogears.redirect('/login')
except:
turbogears.flash(_('Your password could not be reset.'))
return dict()

2
fas/ldap/PgToLDAP.py
View file

@ -405,7 +405,7 @@ def main():
roleLdif.append(["fedoraRoleCreationDate",[str(role[7]) or "None" ]])
roleLdif.append(["fedoraRoleApprovalDate",[str(role[8])]])
ldifWriter.unparse("cn=" + group[0] + "+fedoraRoleType=" + str(role[2]) + ",ou=Roles,cn=" + username[0] + ",ou=People,dc=fedoraproject,dc=org" , roleLdif )
ldifWriter.unparse("cn=" + group[0] + ",ou=Roles,cn=" + username[0] + ",ou=People,dc=fedoraproject,dc=org" , roleLdif )
roleCursor.close()