gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
Martin Renvoize 2022-05-18 16:17:11 +01:00 committed by Tomas Cohen Arazi
parent 9a40eb5820
commit 5a4253aa8e
No known key found for this signature in database
GPG Key ID: 0A272EA1B2F3C15F
10 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
catalogue/ISBDdetail.pl
View File

@ -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,
);
}

5
catalogue/MARCdetail.pl
View File

@ -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,
);
}

3
catalogue/detail.pl
View File

@ -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,
);
}
}

5
catalogue/imageviewer.pl
View File

@ -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,
);
}

5
catalogue/labeledMARCdetail.pl
View File

@ -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,
);
}

5
catalogue/moredetail.pl
View File

@ -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,
);
}

5
catalogue/search.pl
View File

@ -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,
);
}
}

2
koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
View File

@ -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 %]

4
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
View File

@ -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 %]&amp;findborrower=[% holdfor_cardnumber | uri %]">Place hold for [% INCLUDE 'patron-title.inc' patron => holdfor_patron no_title => 1 no_cardnumber => 1 %]</a></span>[% END %]
[% IF ( holdfor ) %] <span class="holdforlink">| <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></span>[% END %]
[% IF ( holdforclub ) %] <span class="holdforlink">| <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]&amp;club=[% holdforclub | uri %]">Place hold for [% holdforclub_name | html %]</a></span>[% END %]
[% ELSE %]
<span>Holds ([% Biblio.HoldsCount( SEARCH_RESULT.biblionumber ) | html %])</span>
@ -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;

2
koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
View File

@ -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 %]&amp;findborrower=[% holdfor_cardnumber | uri %]">Place hold for [% INCLUDE 'patron-title.inc' patron => holdfor_patron no_title => 1 %]</a></span>[% END %]
[% IF ( holdfor ) %] <span class="holdforlink">| <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></span>[% END %]
[% ELSE %]
<span class="noholdstext">No holds allowed</span>
[% END %]