Bugzilla – Attachment 127782 Details for
Bug 29396
"Search to hold" should not rely on cardnumber
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 29396: Make 'Search to hold' work for patron without cardnumber
Bug-29396-Make-Search-to-hold-work-for-patron-with.patch (text/plain), 12.92 KB, created by
Jonathan Druart
on 2021-11-18 10:38:13 UTC
(
hide
)
Description:
Bug 29396: Make 'Search to hold' work for patron without cardnumber
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2021-11-18 10:38:13 UTC
Size:
12.92 KB
patch
obsolete
>From 7c8174e8d63e4a2c83f84cd8f7af2784c0a727fd Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Thu, 18 Nov 2021 11:37:24 +0100 >Subject: [PATCH] Bug 29396: Make 'Search to hold' work for patron without > cardnumber > >--- > catalogue/ISBDdetail.pl | 4 +--- > catalogue/MARCdetail.pl | 4 +--- > catalogue/detail.pl | 4 +--- > catalogue/imageviewer.pl | 6 ++---- > catalogue/labeledMARCdetail.pl | 4 +--- > catalogue/moredetail.pl | 4 +--- > catalogue/search.pl | 4 +--- > koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc | 2 +- > .../intranet-tmpl/prog/en/modules/catalogue/results.tt | 8 ++++---- > .../prog/en/modules/virtualshelves/shelves.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/js/pages/results.js | 4 ++-- > 11 files changed, 16 insertions(+), 30 deletions(-) > >diff --git a/catalogue/ISBDdetail.pl b/catalogue/ISBDdetail.pl >index d991d3e799a..d54bfe82c2c 100755 >--- a/catalogue/ISBDdetail.pl >+++ b/catalogue/ISBDdetail.pl >@@ -109,9 +109,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_cardnumber => $holdfor_patron->cardnumber, >+ holdfor_patron => $holdfor_patron, > ); > } > >diff --git a/catalogue/MARCdetail.pl b/catalogue/MARCdetail.pl >index 4ff6a03c548..8f7e21bfc7f 100755 >--- a/catalogue/MARCdetail.pl >+++ b/catalogue/MARCdetail.pl >@@ -111,9 +111,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_cardnumber => $holdfor_patron->cardnumber, >+ holdfor_patron => $holdfor_patron, > ); > } > >diff --git a/catalogue/detail.pl b/catalogue/detail.pl >index bc28f29cc11..178a296d56a 100755 >--- a/catalogue/detail.pl >+++ b/catalogue/detail.pl >@@ -104,9 +104,7 @@ if($query->cookie("holdfor")){ > $template->param( > # FIXME Should pass the patron object > holdfor => $query->cookie("holdfor"), >- holdfor_surname => $holdfor_patron->surname, >- holdfor_firstname => $holdfor_patron->firstname, >- holdfor_cardnumber => $holdfor_patron->cardnumber, >+ holdfor_patron => $holdfor_patron, > ); > } > } >diff --git a/catalogue/imageviewer.pl b/catalogue/imageviewer.pl >index e9c43a3935e..1fc1f423048 100755 >--- a/catalogue/imageviewer.pl >+++ b/catalogue/imageviewer.pl >@@ -49,10 +49,8 @@ my @items = GetItemsInfo($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_cardnumber => $holdfor_patron->cardnumber, >+ holdfor => $query->cookie("holdfor"), >+ holdfor_patron => $holdfor_patron, > ); > } > >diff --git a/catalogue/labeledMARCdetail.pl b/catalogue/labeledMARCdetail.pl >index 785c2921542..f6db325554d 100755 >--- a/catalogue/labeledMARCdetail.pl >+++ b/catalogue/labeledMARCdetail.pl >@@ -74,9 +74,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_cardnumber => $holdfor_patron->cardnumber, >+ holdfor_patron => $holdfor_patron, > ); > } > >diff --git a/catalogue/moredetail.pl b/catalogue/moredetail.pl >index cff2460a278..99f0aad4a7c 100755 >--- a/catalogue/moredetail.pl >+++ b/catalogue/moredetail.pl >@@ -56,9 +56,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_cardnumber => $holdfor_patron->cardnumber, >+ holdfor_patron => $holdfor_patron, > ); > } > >diff --git a/catalogue/search.pl b/catalogue/search.pl >index 5da9c063f3b..84070d6329f 100755 >--- a/catalogue/search.pl >+++ b/catalogue/search.pl >@@ -197,9 +197,7 @@ if($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_cardnumber => $holdfor_patron->cardnumber, >+ holdfor_patron => $holdfor_patron, > ); > } > } >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 e194411af5d..e2811702d9b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc >@@ -180,7 +180,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_patron.cardnumber || holdfor.borrowernumber | uri %]">Place hold for [% INCLUDE 'patron-title.inc' patron => holdfor_patron %]</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 4115ddacf7a..b7733e36e63 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >@@ -146,9 +146,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 %]</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 %]</a></li> > [% END %] > [% IF holdforclub %] > <li><a href="#" class="placeholdforclub">Place hold for [% holdforclub_name | html %]</a></li> >@@ -504,7 +504,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_patron.cardnumber || holdfor_patron.borrowernumber | uri %]">Place hold for [% INCLUDE 'patron-title.inc' patron => holdfor_patron %]</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 %] > Holds ([% Biblio.HoldsCount( SEARCH_RESULT.biblionumber ) | html %]) >@@ -707,7 +707,7 @@ > var PREF_BrowseResultSelection = parseInt( "[% Koha.Preference('BrowseResultSelection') | html %]", 10); > var PREF_NotHighlightedWords = "[% Koha.Preference('NotHighlightedWords') | html %]"; > var biblionumber = "[% biblionumber | html %]"; >- var holdfor_cardnumber = "[% holdfor_cardnumber | html %]"; >+ var holdfor_id = "[% holdfor_patron.cardnumber || holdfor_patron.borrowernumber | html %]"; > var holdforclub = "[% holdforclub | html %]"; > [% IF SEARCH_RESULTS %] > var SEARCH_RESULTS = 1; >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 09550fe2b4c..4948fc312ff 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >@@ -274,7 +274,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_patron.cardnumber || holdfor_patron.borrowernumber | uri %]">Place hold for [% INCLUDE 'patron-title.inc' patron => holdfor_patron %]</a></span>[% END %] > [% ELSE %] > <span class="noholdstext">No holds allowed</span> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/js/pages/results.js b/koha-tmpl/intranet-tmpl/prog/js/pages/results.js >index 070a8c473de..9634f8ef2ca 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/pages/results.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/pages/results.js >@@ -1,4 +1,4 @@ >-/* global KOHA biblionumber new_results_browser addMultiple vShelfAdd openWindow search_result SEARCH_RESULTS PREF_LocalCoverImages PREF_IntranetCoce PREF_CoceProviders CoceHost CoceProviders addRecord delSingleRecord PREF_BrowseResultSelection resetSearchContext addBibToContext delBibToContext getContextBiblioNumbers holdfor_cardnumber holdforclub strQuery PREF_NotHighlightedWords __ */ >+/* global KOHA biblionumber new_results_browser addMultiple vShelfAdd openWindow search_result SEARCH_RESULTS PREF_LocalCoverImages PREF_IntranetCoce PREF_CoceProviders CoceHost CoceProviders addRecord delSingleRecord PREF_BrowseResultSelection resetSearchContext addBibToContext delBibToContext getContextBiblioNumbers holdfor_id holdforclub strQuery PREF_NotHighlightedWords __ */ > > function verify_cover_images() { > /* Loop over each container in the template which contains covers */ >@@ -396,7 +396,7 @@ function holdfor(){ > } > > function holdForPatron() { >- $("#holdFor").val( holdfor_cardnumber ); >+ $("#holdFor").val( holdfor_id ); > placeHold(); > } > >-- >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 29396
: 127782