Sfoglia il codice sorgente

HUE-3099 [useradmin] Re-order fields of new password screen to make more intuitive

krish 9 anni fa
parent
commit
227c05ad09

+ 2 - 2
apps/useradmin/src/useradmin/forms.py

@@ -88,7 +88,8 @@ class UserChangeForm(django.contrib.auth.forms.UserChangeForm):
       help_text = _t("Required. 30 characters or fewer. No whitespaces or colons."),
       error_messages = {'invalid': _t("Whitespaces and ':' not allowed") })
 
-  password1 = forms.CharField(label=_t("Password"),
+  password_old = forms.CharField(label=_t("Current password"), widget=forms.PasswordInput, required=False)
+  password1 = forms.CharField(label=_t("New Password"),
                               widget=forms.
                               PasswordInput,
                               required=False,
@@ -97,7 +98,6 @@ class UserChangeForm(django.contrib.auth.forms.UserChangeForm):
                               widget=forms.PasswordInput,
                               required=False,
                               validators=get_password_validators())
-  password_old = forms.CharField(label=_t("Previous Password"), widget=forms.PasswordInput, required=False)
   ensure_home_directory = forms.BooleanField(label=_t("Create home directory"),
                                             help_text=_t("Create home directory if one doesn't already exist."),
                                             initial=True,

+ 3 - 3
apps/useradmin/src/useradmin/templates/change_password.mako

@@ -46,6 +46,9 @@ ${ layout.menubar(section='users') }
       <div id="step1" class="stepDetails">
         ${layout.render_field(form["username"], extra_attrs={'validate':'true'})}
         % if "password1" in form.fields:
+          % if username and "password_old" in form.fields:
+            ${layout.render_field(form["password_old"], extra_attrs=username is None and {'validate':'true'} or {})}
+          % endif
           ${layout.render_field(form["password1"], extra_attrs=username is None and {'validate':'true'} or {})}
           % if is_password_policy_enabled():
             <div class="password_rule" style="margin-left:180px; width:500px;">
@@ -53,9 +56,6 @@ ${ layout.menubar(section='users') }
             </div>
           % endif
           ${layout.render_field(form["password2"], extra_attrs=username is None and {'validate':'true'} or {})}
-          % if username and "password_old" in form.fields:
-            ${layout.render_field(form["password_old"], extra_attrs=username is None and {'validate':'true'} or {})}
-          % endif
         % endif
       </div>
       <div class="form-actions">

+ 3 - 3
apps/useradmin/src/useradmin/templates/edit_user.mako

@@ -55,6 +55,9 @@ ${ layout.menubar(section='users') }
       <div id="step1" class="stepDetails">
         ${layout.render_field(form["username"], extra_attrs={'validate':'true'})}
         % if "password1" in form.fields:
+          % if username and "password_old" in form.fields:
+            ${layout.render_field(form["password_old"], extra_attrs=username is None and {'validate':'true'} or {})}
+          % endif
           ${layout.render_field(form["password1"], extra_attrs=username is None and {'validate':'true'} or {})}
           % if is_password_policy_enabled():
             <div class="password_rule" style="margin-left:180px; width:500px;">
@@ -62,9 +65,6 @@ ${ layout.menubar(section='users') }
             </div>
           % endif
           ${layout.render_field(form["password2"], extra_attrs=username is None and {'validate':'true'} or {})}
-          % if username and "password_old" in form.fields:
-            ${layout.render_field(form["password_old"], extra_attrs=username is None and {'validate':'true'} or {})}
-          % endif
         % endif
         ${layout.render_field(form["ensure_home_directory"])}
         </div>