Attachment 136520 Details for Bug 21978 – Bug 21978: (follow-up) Stop passing holdfor_cardnumber

[patch] Bug 21978: (follow-up) Stop passing holdfor_cardnumber

Bug-21978-follow-up-Stop-passing-holdforcardnumber.patch (text/plain), 10.49 KB, created by Martin Renvoize (ashimema) on 2022-06-24 15:18:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2022-06-24 15:18:55 UTC

Size: 10.49 KB

patch

obsolete

>From 15b8280f35e8da33a6c45fce29701f464eb9e11e Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Wed, 18 May 2022 16:17:11 +0100
>Subject: [PATCH] Bug 21978: (follow-up) Stop passing holdfor_cardnumber
>
>We not longer need to pass holdfor_cardnumber distinctly, we can just
>refer to holdfor_patron.cardnumber instead. This patch does that ;P
>
>Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>---
> catalogue/ISBDdetail.pl | 5 ++---
> catalogue/MARCdetail.pl | 5 ++---
> catalogue/detail.pl | 3 +--
> catalogue/imageviewer.pl | 5 ++---
> catalogue/labeledMARCdetail.pl | 5 ++---
> catalogue/moredetail.pl | 5 ++---
> catalogue/search.pl | 5 ++---
> koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt | 4 ++--
> .../intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt | 2 +-
> 10 files changed, 17 insertions(+), 24 deletions(-)
>
>diff --git a/catalogue/ISBDdetail.pl b/catalogue/ISBDdetail.pl
>index 7bb4e61be0..6e3b4bf845 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_patron => $holdfor_patron,
>- holdfor_cardnumber => $holdfor_patron->cardnumber,
>+ holdfor => $query->cookie("holdfor"),
>+ holdfor_patron => $holdfor_patron,
> );
> }
> 
>diff --git a/catalogue/MARCdetail.pl b/catalogue/MARCdetail.pl
>index 8211d58d97..6bb5a834dd 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_patron => $holdfor_patron,
>- holdfor_cardnumber => $holdfor_patron->cardnumber,
>+ holdfor => $query->cookie("holdfor"),
>+ holdfor_patron => $holdfor_patron,
> );
> }
> 
>diff --git a/catalogue/detail.pl b/catalogue/detail.pl
>index 2bdb72cbea..990d108cf3 100755
>--- a/catalogue/detail.pl
>+++ b/catalogue/detail.pl
>@@ -103,9 +103,8 @@ if($query->cookie("holdfor")){
> my $holdfor_patron = Koha::Patrons->find( $query->cookie("holdfor") );
> if ( $holdfor_patron ) {
> $template->param(
>- holdfor => $query->cookie("holdfor"),
>+ holdfor => $query->cookie("holdfor"),
> holdfor_patron => $holdfor_patron,
>- holdfor_cardnumber => $holdfor_patron->cardnumber,
> );
> }
> }
>diff --git a/catalogue/imageviewer.pl b/catalogue/imageviewer.pl
>index 2fede23b02..1fc1f42304 100755
>--- a/catalogue/imageviewer.pl
>+++ b/catalogue/imageviewer.pl
>@@ -49,9 +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_patron => $holdfor_patron,
>- holdfor_cardnumber => $holdfor_patron->cardnumber,
>+ holdfor => $query->cookie("holdfor"),
>+ holdfor_patron => $holdfor_patron,
> );
> }
> 
>diff --git a/catalogue/labeledMARCdetail.pl b/catalogue/labeledMARCdetail.pl
>index 08fbe6aeab..6418fd0edc 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_patron => $holdfor_patron,
>- holdfor_cardnumber => $holdfor_patron->cardnumber,
>+ holdfor => $query->cookie("holdfor"),
>+ holdfor_patron => $holdfor_patron,
> );
> }
> 
>diff --git a/catalogue/moredetail.pl b/catalogue/moredetail.pl
>index 4d9cf401a1..b0dc6e4206 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_patron => $holdfor_patron,
>- holdfor_cardnumber => $holdfor_patron->cardnumber,
>+ holdfor => $query->cookie("holdfor"),
>+ holdfor_patron => $holdfor_patron,
> );
> }
> 
>diff --git a/catalogue/search.pl b/catalogue/search.pl
>index 2097f1385a..24e8692d27 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_patron => $holdfor_patron,
>- holdfor_cardnumber => $holdfor_patron->cardnumber,
>+ holdfor => $cgi->cookie("holdfor"),
>+ 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 a6435194b2..a1ca101dba 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 %]&amp;findborrower=[% holdfor_cardnumber | uri %]">Place hold for [% INCLUDE 'patron-title.inc' patron => holdfor_patron no_title => 1 %]</a></li>
>+ <li><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber | uri %]&amp;findborrower=[% holdfor_patron.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 b9b7208121..f9b80cffe6 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
>@@ -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 ) %] | <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]&amp;findborrower=[% holdfor_cardnumber | uri %]">Place hold for [% INCLUDE 'patron-title.inc' patron => holdfor_patron no_title => 1 no_cardnumber => 1 %]</a>[% END %]
>+ [% IF ( holdfor ) %] | <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]&amp;findborrower=[% holdfor_patron.cardnumber | uri %]">Place hold for [% INCLUDE 'patron-title.inc' patron => holdfor_patron no_title => 1 no_cardnumber => 1 %]</a>[% END %]
> [% IF ( holdforclub ) %] | <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]&amp;club=[% holdforclub | uri %]">Place hold for [% holdforclub_name | html %]</a>[% END %]
> [% ELSE %]
> Holds ([% Biblio.HoldsCount( SEARCH_RESULT.biblionumber ) | html %])
>@@ -724,7 +724,7 @@
> var PREF_StaffHighlightedWords = "[% Koha.Preference('StaffHighlightedWords') | html %]";
> var PREF_NotHighlightedWords = "[% Koha.Preference('NotHighlightedWords') | html %]";
> var biblionumber = "[% biblionumber | html %]";
>- var holdfor_cardnumber = "[% holdfor_cardnumber | html %]";
>+ var holdfor_cardnumber = "[% holdfor_patron.cardnumber | 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 47e164bbe6..3fa48ea555 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 ) %] | <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% itemsloo.biblionumber | uri %]&amp;findborrower=[% holdfor_cardnumber | uri %]">Place hold for [% INCLUDE 'patron-title.inc' patron => holdfor_patron no_title => 1 %]</a>[% END %]
>+ [% IF ( holdfor ) %] | <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% itemsloo.biblionumber | uri %]&amp;findborrower=[% holdfor_patron.cardnumber | uri %]">Place hold for [% INCLUDE 'patron-title.inc' patron => holdfor_patron no_title => 1 %]</a>[% END %]
> [% ELSE %]
> No holds allowed
> [% END %]
>-- 
>2.20.1

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