ref: refs/heads/backgroud_patches_bnc550934 commit 27278dd5538e0738230d74359a72fdbf3c83fd4a Author: Ladislav Slezak Date: Wed Nov 18 21:00:54 2009 +0100 improved password validation revalidate the form also if the "Password" field is changed (part of bnc#555232) 0.0.14 --- .../app/views/administrator/index.html.erb | 10 +++++++--- .../package/yast2-webclient-administrator.changes | 7 +++++++ .../package/yast2-webclient-administrator.spec | 2 +- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/plugins/administrator/app/views/administrator/index.html.erb b/plugins/administrator/app/views/administrator/index.html.erb index d508e19..a9f37aa 100644 --- a/plugins/administrator/app/views/administrator/index.html.erb +++ b/plugins/administrator/app/views/administrator/index.html.erb @@ -37,6 +37,9 @@ }); }); + // start password validation workaround only when "Save" button has been pressed + password_validation_enabled = false; + </script> <% end %> @@ -53,12 +56,13 @@ <%= f.error_messages %> <fieldset id="password"> <p><label><%=_("Password")%></label> - <%= f.password_field :password, :disabled => disabled %> + <!-- onkeyup handler is a workaround for a jQuery bug - it watches only one field for changes in equalTo check --> + <%= f.password_field :password, :disabled => disabled, :onkeyup => "if (password_validation_enabled) $('#adminForm').validate().element('#administrator_confirm_password');" %> </p> <p> <label><%=_("Confirm password")%></label> <%= f.password_field :confirm_password, :disabled => disabled, :equalTo => "#administrator_password", :class => "required" %> - <%= f.submit _("Save Password"), :name => "save_password", :disabled => disabled, :onclick=>"return $('#adminForm').validate().element('#administrator_confirm_password');", :class=>'cancel' %> + <%= f.submit _("Save Password"), :name => "save_password", :disabled => disabled, :onclick=>"password_validation_enabled = true; return $('#adminForm').validate().element('#administrator_confirm_password');", :class=>'cancel' %> </p> <!-- this is a pre-generated placeholder for the validation messages --> <p><label for="administrator_confirm_password" generated="true" class="error"></label><p> @@ -70,7 +74,7 @@ <!-- this is a pre-generated placeholder for the validation messages --> <p><label for="administrator_aliases" generated="true" class="error"></label></p> </fieldset> - <p><%= form_send_buttons :onclick=>"alias_valid = $('#adminForm').validate().element('#administrator_aliases'); return $('#adminForm').validate().element('#administrator_confirm_password') && alias_valid;", :disabled => disabled %> + <p><%= form_send_buttons :onclick=>"password_validation_enabled = true; alias_valid = $('#adminForm').validate().element('#administrator_aliases'); return $('#adminForm').validate().element('#administrator_confirm_password') && alias_valid;", :disabled => disabled %> </p> <% end %> diff --git a/plugins/administrator/package/yast2-webclient-administrator.changes b/plugins/administrator/package/yast2-webclient-administrator.changes index 8b9f278..38579de 100644 --- a/plugins/administrator/package/yast2-webclient-administrator.changes +++ b/plugins/administrator/package/yast2-webclient-administrator.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Nov 18 20:57:32 CET 2009 - lslezak@suse.cz + +- improved password validation - revalidate the form also if + the "Password" field is changed (part of bnc#555232) +- 0.0.14 + +------------------------------------------------------------------- Wed Nov 18 13:58:17 CET 2009 - jsuchome@suse.cz - use Save Password and Save Mail as button labels (bnc#555221) diff --git a/plugins/administrator/package/yast2-webclient-administrator.spec b/plugins/administrator/package/yast2-webclient-administrator.spec index af2a0a4..6dce5f9 100644 --- a/plugins/administrator/package/yast2-webclient-administrator.spec +++ b/plugins/administrator/package/yast2-webclient-administrator.spec @@ -14,7 +14,7 @@ PreReq: yast2-webclient >= 0.0.2 License: GPL v2 only Group: Productivity/Networking/Web/Utilities Autoreqprov: on -Version: 0.0.13 +Version: 0.0.14 Release: 0 Summary: YaST2 - Webclient - Administrator Source: www.tar.bz2 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org