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 <maryse.simard@inlibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

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 84a6a65..d4db2e3 100644 (file)
--- 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 %]
     </title>
     [% 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 %]
             </strong>
         [% END %]
     </div> <!-- /#breadcrumbs -->
@@ -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 %]
                         </h1>
 
                         [% IF quickadd && opadd && !check_member %]