From fa619edb697dd8e5e12773c42e62106efbf852ba Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 4 Sep 2019 17:04:33 +0000 Subject: [PATCH] Bug 23536: Remove obsolete category markup from patron entry This patch removes some obsolete markup from the patron entry template (memberentrygen.tt). The old markup was necessary in a long-gone version of Koha where it was possible to add patrons using built-in categories instead of defining your own. To test, apply the patch and test the process of adding or editing patrons. You should see the patron category displayed correctly in the page title, breadcrumbs, and main heading. Signed-off-by: Maryse Simard --- .../prog/en/modules/members/memberentrygen.tt | 31 +++------------------- 1 file changed, 3 insertions(+), 28 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 954a8e5..2b4d613 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -13,15 +13,7 @@ [% ELSE %] Modify patron [% END %] [% INCLUDE 'patron-title.inc' no_html = 1 %] - ([% IF categoryname %] - [% categoryname | html %] - [% ELSE %] - [% IF ( I ) %] Organization [% END %] - [% IF ( A ) %] Adult [% END %] - [% IF ( C ) %] Child [% END %] - [% IF ( P ) %] Professional [% END %] - [% IF ( S ) %] Staff [% END %] - [% END %]) + [% IF categoryname %]([% categoryname | html %])[% END %] [% END %] [% INCLUDE 'doc-head-close.inc' %] @@ -49,15 +41,7 @@ [% ELSE %] Modify patron [% END %] - ([% IF ( categoryname ) %] - [% categoryname | html %] - [% ELSE %] - [% IF ( I ) %] Organization [% END %] - [% IF ( A ) %] Adult [% END %] - [% IF ( C ) %] Child [% END %] - [% IF ( P ) %] Professional [% END %] - [% IF ( S ) %] Staff [% END %] - [% END %]) + [% IF categoryname %]([% categoryname | html %])[% END %] [% END # /UNLESS blocking_error %] @@ -97,16 +81,7 @@ [% END %] [% INCLUDE 'patron-title.inc' %] - - ([% IF ( categoryname ) %] - [% categoryname | html %] - [% ELSE %] - [% IF ( I ) %] Organization [% END %] - [% IF ( A ) %] Adult [% END %] - [% IF ( C ) %] Child [% END %] - [% IF ( P ) %] Professional [% END %] - [% IF ( S ) %] Staff [% END %] - [% END %]) + [% IF categoryname %]([% categoryname | html %])[% END %] [% IF quickadd && opadd && !check_member %] -- 2.7.4