Changeset 1395

Timestamp:

02/15/11 15:26:10 (15 months ago)

Author:

zeank

Message:

make admin repeat passwords too
refs #270

Location:

HelpIM3/branches/chatgroups/HelpIM/auth

Files:

• pages/EditUserPanel.py (modified) (1 diff)
• templates/EditUserPanelTemplate.py (modified) (2 diffs)

HelpIM3/branches/chatgroups/HelpIM/auth/pages/EditUserPanel.py

@@ -21 +21 @@
         self.checkNotEmpty('user_name', 'De gebruikersnaam is verplicht')
         
-        if self.function.endswith('Admin'):
-            self.checkNotEmpty('user_password', 'Het wachtwoord is verplicht')
-        else:
-            if self.checkNotEmpty('user_password', 'Het wachtwoord is verplicht') and \
-                   self.checkNotEmpty('user_password2', 'Het wachtwoord is verplicht'):
-                self.checkMatch('user_password', 'user_password2', 'Beide wachtwoorden zijn niet gelijk')
+        if self.checkNotEmpty('user_password', 'Het wachtwoord is verplicht') and \
+               self.checkNotEmpty('user_password2', 'Het wachtwoord is verplicht'):
+            self.checkMatch('user_password', 'user_password2', 'Beide wachtwoorden zijn niet gelijk')
 
         # self.checkNotEmpty('user_lang', 'De taal is verplicht')

HelpIM3/branches/chatgroups/HelpIM/auth/templates/EditUserPanelTemplate.py

@@ -49 +49 @@
                                              }
         
-        user_password_type = 'password'
-        if self.function.endswith('Admin'):
-            user_password_type = 'text'
         user_password = {  'text_input_field': [  {'id':'user_password',
                                                                         'name': 'Wachtwoord',
@@ -161 +158 @@
                                                 user_nickName,
                                                 user_password,
-                                                user_pwd_strength_lbl, user_pwd_strength_ind,
+                                                user_password2,
+                                                user_pwd_strength_lbl,
+                                                user_pwd_strength_ind,
                                                 user_email,
                                                 user_department,