From f4c7d7206fb7c95149b6fc83080ae426f7a72693 Mon Sep 17 00:00:00 2001 From: Michael Patrick McGrath Date: Wed, 5 Sep 2007 10:05:12 -0700 Subject: [PATCH 1/3] Fixed some issues with password reset --- fas/fas/user.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fas/fas/user.py b/fas/fas/user.py index 8a489df..3e8ed59 100644 --- a/fas/fas/user.py +++ b/fas/fas/user.py @@ -162,7 +162,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.')) @@ -278,8 +278,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() From fcbdf371d49d9a9dafa2e54d2fcf81677eab44a0 Mon Sep 17 00:00:00 2001 From: Michael Patrick McGrath Date: Wed, 5 Sep 2007 11:11:58 -0700 Subject: [PATCH 2/3] Fix for null values --- fas/fas/templates/user/view.html | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/fas/fas/templates/user/view.html b/fas/fas/templates/user/view.html index bb3dcc7..c2310dc 100644 --- a/fas/fas/templates/user/view.html +++ b/fas/fas/templates/user/view.html @@ -13,15 +13,15 @@

Account Details (edit)

-
Account Name
${user.cn}
-
Real Name
${user.givenName}
-
Email
${user.mail}
-
Bugzilla Email
${user.fedoraPersonBugzillaMail}
-
IRC Nick
${user.fedoraPersonIrcNick}
-
PGP Key
${user.fedoraPersonKeyId}
-
Telephone Number
${user.telephoneNumber}
-
Postal Address
${user.postalAddress}
-
Description
${user.description}
+
Account Name
${user.cn} 
+
Real Name
${user.givenName} 
+
Email
${user.mail} 
+
Bugzilla Email
${user.fedoraPersonBugzillaMail} 
+
IRC Nick
${user.fedoraPersonIrcNick} 
+
PGP Key
${user.fedoraPersonKeyId} 
+
Telephone Number
${user.telephoneNumber} 
+
Postal Address
${user.postalAddress} 
+
Description
${user.description} 
Password
Valid (change)
Account Status
Approved, Active
CLA
Done Not Done
From cc9bbe603b5f36b453217889064439dfdc6abbdc Mon Sep 17 00:00:00 2001 From: Michael Patrick McGrath Date: Wed, 5 Sep 2007 14:49:03 -0700 Subject: [PATCH 3/3] We no longer need this fuller format for LDAP --- fas/ldap/PgToLDAP.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fas/ldap/PgToLDAP.py b/fas/ldap/PgToLDAP.py index 3b83868..9d7884d 100644 --- a/fas/ldap/PgToLDAP.py +++ b/fas/ldap/PgToLDAP.py @@ -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()