From fc972915f9685b542e3dc305b390a691c2487260 Mon Sep 17 00:00:00 2001 From: Petro Vashchuk Date: Mon, 17 Jan 2022 16:17:51 +0200 Subject: [PATCH] Bug 29684: Fix warn about js/locale_data.js (memberentry.pl) To reproduce (memberentry.pl): 1) Head over to the patron details page, press edit button to open the memberentry.pl page. 2) The error message should have appeared in your log file about "File not found : default/js/locale_data.js". 3) Apply the patch. 4) Open the edit page again, ensure that the new error massage like that didn't appear. Signed-off-by: David Nind Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart Signed-off-by: Fridolin Somers --- .../prog/en/modules/members/memberentrygen.tt | 86 +++++++++---------- members/memberentry.pl | 2 +- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt index 39f1e5f2a8..38ad7f117a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -49,9 +49,9 @@ legend:hover {
  • Patrons
    • - [% IF (firstname || surname ) %] + [% IF (borrower_data.firstname || borrower_data.surname ) %]
  • - + [% INCLUDE 'patron-title.inc' %]
    • @@ -76,8 +76,8 @@ legend:hover {
    - [% IF messages %] - [% FOR message IN messages %] + [% IF borrower_data.messages %] + [% FOR message IN borrower_data.messages %] [% SWITCH message.error %] [% CASE 'error_on_insert_patron' %]
    Something went wrong when creating the patron. Check the logs.
    @@ -226,7 +226,7 @@ legend:hover { [% IF opadd %] [% ELSE %] - + [% END %] Cancel @@ -243,7 +243,7 @@ legend:hover { - + [% IF ( step ) %] @@ -257,8 +257,8 @@ legend:hover { [% IF step == 4 || step == 5 || step == 6 || step == 2 || step == 1 || step == 7 %] [%# Only put the card number if we arent showing it in the form later %] - [% IF cardnumber %] - + [% IF borrower_data.cardnumber %] + [% END %] [% END %] [% END %] @@ -312,9 +312,9 @@ legend:hover { [% END %] [% IF ( uppercasesurnames ) %] - + [% ELSE %] - + [% END %] [% IF ( mandatorysurname ) %] Required @@ -332,7 +332,7 @@ legend:hover { [% END %] First name: - + [% IF ( mandatoryfirstname ) %] Required [% END %] @@ -347,7 +347,7 @@ legend:hover { [% END %] Date of birth: - + [% IF ( mandatorydateofbirth ) %] Required [% END %] @@ -366,7 +366,7 @@ legend:hover { [% END %] Initials: - + [% IF ( mandatoryinitials ) %] Required [% END %] @@ -382,7 +382,7 @@ legend:hover { [% END %] Other name: - + [% IF ( mandatoryothernames ) %] Required [% END %] @@ -443,7 +443,7 @@ legend:hover { [% INCLUDE 'patron-title.inc' patron=r.guarantor hide_patron_infos_if_needed=1 %]
  • - Relationship: + borrower_data.Relationship: [% r.relationship | html %]
    • [% ELSE %] @@ -452,7 +452,7 @@ legend:hover { [% INCLUDE 'patron-title.inc' patron=r.guarantor hide_patron_infos_if_needed=1 %]
  • - Relationship: + borrower_data.Relationship: [% r.relationship | html %]
    • @@ -561,7 +561,7 @@ legend:hover {
  • - [% IF privacy_guarantor_fines %] + [% IF borrower_data.privacy_guarantor_fines %] [% ELSE %] @@ -636,7 +636,7 @@ legend:hover { + [% IF mandatorycardnumber %] Required [% END %] Card number must not be more than [% maxlength_cardnumber | html %] characters.
    Card number must be exactly [% minlength_cardnumber | html %] characters. [% ELSIF minlength_cardnumber && maxlength_cardnumber %] - + [% IF mandatorycardnumber %] Required [% END %] Card number must not be more than [% maxlength_cardnumber | html %] characters.
    Card number must be between [% minlength_cardnumber | html %] and [% maxlength_cardnumber | html %] characters. [% ELSIF maxlength_cardnumber %] - + [% IF mandatorycardnumber %] Required [% END %] Card number must not be more than [% maxlength_cardnumber | html %] characters.
    Card number can be up to [% maxlength_cardnumber | html %] characters. [% ELSE %] - + [% IF mandatorycardnumber %] Required [% END %] @@ -998,11 +998,11 @@ legend:hover {
  • + [% IF ( mandatorydateenrolled ) %] Required [% END %] @@ -1079,9 +1079,9 @@ legend:hover { Expiry date (leave blank for auto calc): [% UNLESS ( opadd ) %] - + [% ELSE %] - + [% END %] [% IF ( mandatorydateexpiry ) %] Required @@ -1101,7 +1101,7 @@ legend:hover { [% END %] OPAC note: - +
    This message appears on this patron's user page in the OPAC
    [% IF ( mandatoryopacnote ) %] Required @@ -1118,7 +1118,7 @@ legend:hover { [% END %] Circulation note: - +
    This message displays when checking out to this patron
    [% IF ( mandatoryborrowernotes ) %] Required @@ -1147,13 +1147,13 @@ legend:hover { [% IF ( opduplicate ) %] [% ELSE %] - + [% END %] [% ELSE %] [% IF ( opduplicate ) %] [% ELSE %] - + [% END %] [% END # /IF ( NoUpdateLogin ) %] @@ -1180,18 +1180,18 @@ legend:hover { [% IF ( opduplicate ) %] [% ELSE %] - + [% END %] [% ELSE %] [% IF ( opduplicate ) %] [% ELSE %] - + [% END %] [% END # /IF ( NoUpdateLogin ) %] [% ELSE # IF ( opadd ) %] - [% IF ( password ) %] + [% IF ( borrower_data.password ) %] [% IF ( NoUpdateLogin ) %] [% ELSE %] @@ -1237,17 +1237,17 @@ legend:hover { [% IF ( opduplicate ) %] [% ELSE %] - + [% END %] [% ELSE %] [% IF ( opduplicate ) %] [% ELSE %] - + [% END %] [% END %] [% ELSE # IF ( opadd ) %] - [% IF ( password ) %] + [% IF ( borrower_data.password ) %] [% IF ( NoUpdateLogin ) %] [% ELSE %] @@ -1508,7 +1508,7 @@ legend:hover {