From f19c38aaa124432ff615ae5c9a9de75466925676 Mon Sep 17 00:00:00 2001 From: David Bourgault Date: Tue, 29 May 2018 15:59:40 -0400 Subject: [PATCH] Bug 11879: (follow-up) Corrected OPAC and removed unrelated changes --- .../intranet-tmpl/prog/en/modules/members/moremember-brief.tt | 8 ++++---- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt | 11 ++++++++++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt index 16e9f85..7a4614f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt @@ -19,7 +19,7 @@
- [% UNLESS ( I ) %][% IF ( patron.othernames ) %]“[% patron.othernames %]”[% END %] + [% UNLESS ( I ) %][% IF ( othernames ) %]“[% othernames %]”[% END %]
    [% IF Koha.Preference( 'AddressFormat' ) %] @@ -61,9 +61,9 @@

    Library use

      -
    1. Card number: [% patron.cardnumber %]
    2. -
    3. Borrowernumber: [% patron.borrowernumber %]
    4. -
    5. Category: [% patron.category.description %] ([% patron.categorycode %])
    6. +
    7. Card number: [% cardnumber %]
    8. +
    9. Borrowernumber: [% borrowernumber %]
    10. +
    11. Category: [% categoryname %] ([% categorycode %])
    12. Registration date: [% dateenrolled | $KohaDates %]
    13. Expiration date: [% IF ( was_renewed ) %] 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 2cd6834..fda8ae9 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt @@ -548,8 +548,14 @@ [% IF mandatory.defined('fax') %]Required[% END %]
    14. [% END %] + [% UNLESS hidden.defined('primary_contact_method') %]
    15. - + [% IF ( mandatory.defined('primary_contact_method') ) %] + + [% ELSE %] + + [% END %] + + + [% IF ( mandatory.defined('primary_contact_method') ) %]Required[% END %]
    16. + [% END %]
    [% END %] -- 2.7.4