From b19b48437e11f3d7e055e4c3487683d0123886e4 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Fri, 24 Jan 2020 17:33:48 +0000 Subject: [PATCH] Bug 24514: Add option to exclude title from patron-title.inc and use it on 'holds awaiting pickup' Without this patch sorting by patron name on the 'holds awaiting pickup' report sorted by title, surname, firstname. With this patch the list will sort by surname, firstname, ignoring the title. To test: - generate and capture a hold for a patron named "Mr. A A" - generate and capture a hold for a patron named "A A" - generste and capture a hold for patron named "Mr. B B" - generste and capture a hold for patron named "B B" - go to holds awaiting pickup - sort by patron name ascending - holds sort Mr. A, Mr. B, A, B - sort by patron name descending - holds sort B, A, Mr. B, Mr. A - APPLY PATCH - Reload holds awaiting pickup - Confirm holds sort on Surname Signed-off-by: Andrew Fuerste-Henry Signed-off-by: Katrin Fischer --- koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc | 1 + koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc index 7c280f57e8..d5dcd7d0f0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc @@ -28,6 +28,7 @@ [%- SET data.title = title -%] [%- END -%] [%# Parameter no_html - if 1, the html tags are NOT generated %] +[%- IF no_title %][% SET data.title = "" %][% END -%] [%- IF data.title %] [%- IF no_html %] [%- span_start = '' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc index 3ec275f7fb..e445ace165 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc @@ -30,7 +30,7 @@ [% END %]
Barcode: [% reserveloo.item.barcode | html %] - [% INCLUDE 'patron-title.inc' patron=reserveloo.borrower invert_name=1 %] + [% INCLUDE 'patron-title.inc' patron=reserveloo.borrower invert_name=1 no_title=1 %] [% IF ( reserveloo.borrower.phone ) %]
[% reserveloo.borrower.phone | html %][% END %] [% IF ( reserveloo.borrower.first_valid_email_address ) %]
-- 2.11.0