Bugzilla – Attachment 135186 Details for
Bug 21978
Add middle name field
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 21978: Use patron-title for holdfor handling in results
Bug-21978-Use-patron-title-for-holdfor-handling-in.patch (text/plain), 12.35 KB, created by
Jonathan Druart
on 2022-05-19 05:32:16 UTC
(
hide
)
Description:
Bug 21978: Use patron-title for holdfor handling in results
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2022-05-19 05:32:16 UTC
Size:
12.35 KB
patch
obsolete
>From 56f2d7a094f96457690a0aa1727a729c6b46f617 Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Tue, 3 May 2022 11:07:00 +0100 >Subject: [PATCH] Bug 21978: Use patron-title for holdfor handling in results > >This patch update the catalogue search results page to use the >patron-title include to display patron titles for the 'Holds for' line >in results and dropdown list. > >Test plan >1) Load patron account >2) Press search to hold >3) Perform a search which brings back 2+ items (e.g. 'street') >4) Note that on the search results it says: Place hold for 'firstname > (othername) surname (cardnumber)' >5) Press the Place hold button and note that the dropdown includes > "Place hold for 'firstname (othername) surname'" and "Forget > 'firstname (othername) surname'" >6) Click through to an item from the results, press the 'Place hold' > button and note the dropdown includes "Place hold for 'firstname > (othername) surname'" > >Signed-off-by: Sally <sally.healey@cheshiresharedservices.gov.uk> > >Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >--- > catalogue/ISBDdetail.pl | 5 ++--- > catalogue/MARCdetail.pl | 5 ++--- > catalogue/detail.pl | 4 +--- > catalogue/imageviewer.pl | 3 +-- > catalogue/labeledMARCdetail.pl | 5 ++--- > catalogue/moredetail.pl | 5 ++--- > catalogue/search.pl | 5 ++--- > koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc | 2 +- > .../intranet-tmpl/prog/en/modules/catalogue/results.tt | 6 +++--- > .../intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt | 2 +- > 10 files changed, 17 insertions(+), 25 deletions(-) > >diff --git a/catalogue/ISBDdetail.pl b/catalogue/ISBDdetail.pl >index d991d3e799a..7bb4e61be0f 100755 >--- a/catalogue/ISBDdetail.pl >+++ b/catalogue/ISBDdetail.pl >@@ -108,9 +108,8 @@ my $res = GetISBDView({ > if($query->cookie("holdfor")){ > my $holdfor_patron = Koha::Patrons->find( $query->cookie("holdfor") ); > $template->param( >- holdfor => $query->cookie("holdfor"), >- holdfor_surname => $holdfor_patron->surname, >- holdfor_firstname => $holdfor_patron->firstname, >+ holdfor => $query->cookie("holdfor"), >+ holdfor_patron => $holdfor_patron, > holdfor_cardnumber => $holdfor_patron->cardnumber, > ); > } >diff --git a/catalogue/MARCdetail.pl b/catalogue/MARCdetail.pl >index 4ff6a03c548..8211d58d97b 100755 >--- a/catalogue/MARCdetail.pl >+++ b/catalogue/MARCdetail.pl >@@ -110,9 +110,8 @@ my $biblio = GetBiblioData($biblionumber); > if($query->cookie("holdfor")){ > my $holdfor_patron = Koha::Patrons->find( $query->cookie("holdfor") ); > $template->param( >- holdfor => $query->cookie("holdfor"), >- holdfor_surname => $holdfor_patron->surname, >- holdfor_firstname => $holdfor_patron->firstname, >+ holdfor => $query->cookie("holdfor"), >+ holdfor_patron => $holdfor_patron, > holdfor_cardnumber => $holdfor_patron->cardnumber, > ); > } >diff --git a/catalogue/detail.pl b/catalogue/detail.pl >index 29b6167f612..2d8e07698b9 100755 >--- a/catalogue/detail.pl >+++ b/catalogue/detail.pl >@@ -103,10 +103,8 @@ if($query->cookie("holdfor")){ > my $holdfor_patron = Koha::Patrons->find( $query->cookie("holdfor") ); > if ( $holdfor_patron ) { > $template->param( >- # FIXME Should pass the patron object > holdfor => $query->cookie("holdfor"), >- holdfor_surname => $holdfor_patron->surname, >- holdfor_firstname => $holdfor_patron->firstname, >+ holdfor_patron => $holdfor_patron, > holdfor_cardnumber => $holdfor_patron->cardnumber, > ); > } >diff --git a/catalogue/imageviewer.pl b/catalogue/imageviewer.pl >index e9c43a3935e..2fede23b02c 100755 >--- a/catalogue/imageviewer.pl >+++ b/catalogue/imageviewer.pl >@@ -50,8 +50,7 @@ if ( $query->cookie("holdfor") ) { > my $holdfor_patron = Koha::Patrons->find( $query->cookie("holdfor") ); > $template->param( > holdfor => $query->cookie("holdfor"), >- holdfor_surname => $holdfor_patron->surname, >- holdfor_firstname => $holdfor_patron->firstname, >+ holdfor_patron => $holdfor_patron, > holdfor_cardnumber => $holdfor_patron->cardnumber, > ); > } >diff --git a/catalogue/labeledMARCdetail.pl b/catalogue/labeledMARCdetail.pl >index 785c2921542..08fbe6aeab3 100755 >--- a/catalogue/labeledMARCdetail.pl >+++ b/catalogue/labeledMARCdetail.pl >@@ -73,9 +73,8 @@ my $biblio = GetBiblioData($biblionumber); > if($query->cookie("holdfor")){ > my $holdfor_patron = Koha::Patrons->find( $query->cookie("holdfor") ); > $template->param( >- holdfor => $query->cookie("holdfor"), >- holdfor_surname => $holdfor_patron->surname, >- holdfor_firstname => $holdfor_patron->firstname, >+ holdfor => $query->cookie("holdfor"), >+ holdfor_patron => $holdfor_patron, > holdfor_cardnumber => $holdfor_patron->cardnumber, > ); > } >diff --git a/catalogue/moredetail.pl b/catalogue/moredetail.pl >index cff2460a278..4d9cf401a13 100755 >--- a/catalogue/moredetail.pl >+++ b/catalogue/moredetail.pl >@@ -55,9 +55,8 @@ $template->param( > if($query->cookie("holdfor")){ > my $holdfor_patron = Koha::Patrons->find( $query->cookie("holdfor") ); > $template->param( >- holdfor => $query->cookie("holdfor"), >- holdfor_surname => $holdfor_patron->surname, >- holdfor_firstname => $holdfor_patron->firstname, >+ holdfor => $query->cookie("holdfor"), >+ holdfor_patron => $holdfor_patron, > holdfor_cardnumber => $holdfor_patron->cardnumber, > ); > } >diff --git a/catalogue/search.pl b/catalogue/search.pl >index ef7f49088f0..2097f1385a9 100755 >--- a/catalogue/search.pl >+++ b/catalogue/search.pl >@@ -203,9 +203,8 @@ if($cgi->cookie("holdfor")){ > my $holdfor_patron = Koha::Patrons->find( $cgi->cookie("holdfor") ); > if ( $holdfor_patron ) { # may have been deleted in the meanwhile > $template->param( >- holdfor => $cgi->cookie("holdfor"), >- holdfor_surname => $holdfor_patron->surname, >- holdfor_firstname => $holdfor_patron->firstname, >+ holdfor => $cgi->cookie("holdfor"), >+ holdfor_patron => $holdfor_patron, > holdfor_cardnumber => $holdfor_patron->cardnumber, > ); > } >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc >index 1f352ab3ae2..a6435194b20 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc >@@ -182,7 +182,7 @@ > </button> > <ul class="dropdown-menu"> > <li><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber | uri %]">Place hold</a></li> >- <li><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber | uri %]&findborrower=[% holdfor_cardnumber | uri %]">Place hold for [% holdfor_firstname | html %] [% holdfor_surname | html %] ([% holdfor_cardnumber | html %])</a></li> >+ <li><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber | uri %]&findborrower=[% holdfor_cardnumber | uri %]">Place hold for [% INCLUDE 'patron-title.inc' patron => holdfor_patron no_title => 1 %]</a></li> > </ul> > </div> > [% ELSE %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >index 0e550fd353c..e17480f0524 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >@@ -143,9 +143,9 @@ > <ul class="dropdown-menu"> > <li><a href="#" class="placehold">Place hold</a></li> > [% IF holdfor %] >- <li><a href="#" class="placeholdfor">Place hold for [% holdfor_firstname | html %] [% holdfor_surname | html %] ([% holdfor_cardnumber | html %])</a></li> >+ <li><a href="#" class="placeholdfor">Place hold for [% INCLUDE 'patron-title.inc' patron => holdfor_patron no_title => 1 no_cardnumber => 1 %]</a></li> > <li class="divider"></li> >- <li><a href="#" id="forgetholdfor">Forget [% holdfor_firstname | html %] [% holdfor_surname | html %] ([% holdfor_cardnumber | html %])</a></li> >+ <li><a href="#" id="forgetholdfor">Forget [% INCLUDE 'patron-title.inc' patron => holdfor_patron no_title => 1 no_cardnumber => 1 %]</a></li> > [% END %] > [% IF holdforclub %] > <li><a href="#" class="placeholdforclub">Place hold for [% holdforclub_name | html %]</a></li> >@@ -519,7 +519,7 @@ > [% ELSE %] > [% IF CAN_user_reserveforothers_place_holds %] > <a id="reserve_[% SEARCH_RESULT.biblionumber | html %]" href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %]">Holds ([% Biblio.HoldsCount( SEARCH_RESULT.biblionumber ) | html %])</a> >- [% IF ( holdfor ) %] <span class="holdforlink">| <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]&findborrower=[% holdfor_cardnumber | uri %]">Place hold for [% holdfor_firstname | html %] [% holdfor_surname | html %] ([% holdfor_cardnumber | html %])</a></span>[% END %] >+ [% IF ( holdfor ) %] <span class="holdforlink">| <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]&findborrower=[% holdfor_cardnumber | uri %]">Place hold for [% INCLUDE 'patron-title.inc' patron => holdfor_patron no_title => 1 no_cardnumber => 1 %]</a></span>[% END %] > [% IF ( holdforclub ) %] <span class="holdforlink">| <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]&club=[% holdforclub | uri %]">Place hold for [% holdforclub_name | html %]</a></span>[% END %] > [% ELSE %] > <span>Holds ([% Biblio.HoldsCount( SEARCH_RESULT.biblionumber ) | html %])</span> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >index b83781c0510..b57f4b51cc3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >@@ -276,7 +276,7 @@ > [% ELSE %] > [% IF ( itemsloo.ITEM_RESULTS.size ) %] > <a id="reserve_[% itemsloo.biblionumber | html %]" href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% itemsloo.biblionumber | html %]">Holds</a> >- [% IF ( holdfor ) %] <span class="holdforlink">| <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% itemsloo.biblionumber | uri %]&findborrower=[% holdfor_cardnumber | uri %]">Place hold for [% holdfor_firstname | html %] [% holdfor_surname | html %] ([% holdfor_cardnumber | html %])</a></span>[% END %] >+ [% IF ( holdfor ) %] <span class="holdforlink">| <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% itemsloo.biblionumber | uri %]&findborrower=[% holdfor_cardnumber | uri %]">Place hold for [% INCLUDE 'patron-title.inc' patron => holdfor_patron no_title => 1 %]</a></span>[% END %] > [% ELSE %] > <span class="noholdstext">No holds allowed</span> > [% END %] >-- >2.25.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 21978
:
133431
|
133432
|
133433
|
133434
|
133435
|
133436
|
133437
|
133438
|
133453
|
133454
|
133455
|
133456
|
133534
|
133535
|
133536
|
133537
|
133544
|
133545
|
133546
|
133547
|
133751
|
133752
|
133753
|
133754
|
133755
|
133756
|
133757
|
134254
|
134255
|
134256
|
134257
|
134258
|
134259
|
134495
|
134497
|
134498
|
134499
|
134500
|
134501
|
134502
|
134503
|
134745
|
134746
|
134747
|
134748
|
134749
|
134750
|
134751
|
135147
|
135148
|
135149
|
135150
|
135151
|
135152
|
135153
|
135154
|
135155
|
135180
|
135181
|
135182
|
135183
|
135184
|
135185
|
135186
|
135187
|
135188
|
135189
|
136513
|
136514
|
136515
|
136516
|
136517
|
136518
|
136519
|
136520
|
136521
|
136522
|
137612