From 428fd1b6af81f8cc2b0715256ed562aa37e9b655 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 28 Feb 2020 15:00:40 +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 | 30 +++------------------- 1 file changed, 3 insertions(+), 27 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 84a6a6575be..d4db2e37b31 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -17,15 +17,7 @@ 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' %] @@ -53,15 +45,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 %] @@ -99,15 +83,7 @@ Modify patron [% 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.11.0