From 897a32d8201759cbc350ac2d67a423f218f4e6cf Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Fri, 18 Dec 2015 19:30:13 +0000 Subject: [PATCH] Bug 15343 [QA Followup] - Fix issues 1) "Contact information" should be "Password" 2) Don't pass sysprefs from the script to the template, use Koha.Preference() 3) minPasswordLength is optional, we cannot always assume it is set 4) Password field when does not follow convention completely when mandatory --- .../bootstrap/en/modules/opac-memberentry.tt | 58 ++++++++++++-------- opac/opac-memberentry.pl | 1 - 2 files changed, 34 insertions(+), 25 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt index f39cf68..c5a636e 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt @@ -754,31 +754,41 @@ [% UNLESS action == 'edit' %]
- Contact information - [% UNLESS hidden.defined('password') %] -
Your password must be at least [% minpassw %] characters long. - [% IF mandatory.defined('password') %] -
You must enter a password!
-
    -
  1. - -
  2. -
  3. - -
  4. -
- [% ELSE %] -
If you do not enter a password a system generated password will be created -
    -
  1. - -
  2. -
  3. - -
  4. -
+ Password + [% UNLESS hidden.defined('password') %] + [% IF Koha.Preference('minPasswordLength') || !mandatory.defined('password') %] +
+ [% IF Koha.Preference('minPasswordLength') %] +

Your password must be at least [% Koha.Preference('minPasswordLength') %] characters long.

+ [% END %] + [% UNLESS mandatory.defined('password') %] + If you do not enter a password a system generated password will be created. + [% END %] +
+ [% END %] + + [% IF mandatory.defined('password') %] +
    +
  1. + + Required +
  2. +
  3. + + Required +
  4. +
+ [% ELSE %] +
    +
  1. + +
  2. +
  3. + +
  4. +
+ [% END %] [% END %] - [% END %]
diff --git a/opac/opac-memberentry.pl b/opac/opac-memberentry.pl index 3ef6f61..56d1be1 100755 --- a/opac/opac-memberentry.pl +++ b/opac/opac-memberentry.pl @@ -66,7 +66,6 @@ $template->param( action => $action, hidden => $hidden, mandatory => $mandatory, - minpassw => C4::Context->preference('minPasswordLength'), member_titles => GetTitles() || undef, branches => GetBranchesLoop(), OPACPatronDetails => C4::Context->preference('OPACPatronDetails'), -- 1.7.10.4