Attachment #136519 for bug #21978

View | Details | Raw Unified | Return to bug 21978
Collapse All | Expand All

Lines 108-116 my $res = GetISBDView({ Link Here

(-)a/catalogue/ISBDdetail.pl (-3 / +2 lines)
108	if($query->cookie("holdfor")){	108	if($query->cookie("holdfor")){
109	my $holdfor_patron = Koha::Patrons->find( $query->cookie("holdfor") );	109	my $holdfor_patron = Koha::Patrons->find( $query->cookie("holdfor") );
110	$template->param(	110	$template->param(
111	holdfor => $query->cookie("holdfor"),	111	holdfor => $query->cookie("holdfor"),
112	holdfor_surname => $holdfor_patron->surname,	112	holdfor_patron => $holdfor_patron,
113	holdfor_firstname => $holdfor_patron->firstname,
114	holdfor_cardnumber => $holdfor_patron->cardnumber,	113	holdfor_cardnumber => $holdfor_patron->cardnumber,
115	);	114	);
116	}	115	}

Lines 110-118 my $biblio = GetBiblioData($biblionumber); Link Here

(-)a/catalogue/MARCdetail.pl (-3 / +2 lines)
110	if($query->cookie("holdfor")){	110	if($query->cookie("holdfor")){
111	my $holdfor_patron = Koha::Patrons->find( $query->cookie("holdfor") );	111	my $holdfor_patron = Koha::Patrons->find( $query->cookie("holdfor") );
112	$template->param(	112	$template->param(
113	holdfor => $query->cookie("holdfor"),	113	holdfor => $query->cookie("holdfor"),
114	holdfor_surname => $holdfor_patron->surname,	114	holdfor_patron => $holdfor_patron,
115	holdfor_firstname => $holdfor_patron->firstname,
116	holdfor_cardnumber => $holdfor_patron->cardnumber,	115	holdfor_cardnumber => $holdfor_patron->cardnumber,
117	);	116	);
118	}	117	}

Lines 103-112 if($query->cookie("holdfor")){ Link Here

(-)a/catalogue/detail.pl (-3 / +1 lines)
103	my $holdfor_patron = Koha::Patrons->find( $query->cookie("holdfor") );	103	my $holdfor_patron = Koha::Patrons->find( $query->cookie("holdfor") );
104	if ( $holdfor_patron ) {	104	if ( $holdfor_patron ) {
105	$template->param(	105	$template->param(
106	# FIXME Should pass the patron object
107	holdfor => $query->cookie("holdfor"),	106	holdfor => $query->cookie("holdfor"),
108	holdfor_surname => $holdfor_patron->surname,	107	holdfor_patron => $holdfor_patron,
109	holdfor_firstname => $holdfor_patron->firstname,
110	holdfor_cardnumber => $holdfor_patron->cardnumber,	108	holdfor_cardnumber => $holdfor_patron->cardnumber,
111	);	109	);
112	}	110	}

Lines 50-57 if ( $query->cookie("holdfor") ) { Link Here

(-)a/catalogue/imageviewer.pl (-2 / +1 lines)
50	my $holdfor_patron = Koha::Patrons->find( $query->cookie("holdfor") );	50	my $holdfor_patron = Koha::Patrons->find( $query->cookie("holdfor") );
51	$template->param(	51	$template->param(
52	holdfor => $query->cookie("holdfor"),	52	holdfor => $query->cookie("holdfor"),
53	holdfor_surname => $holdfor_patron->surname,	53	holdfor_patron => $holdfor_patron,
54	holdfor_firstname => $holdfor_patron->firstname,
55	holdfor_cardnumber => $holdfor_patron->cardnumber,	54	holdfor_cardnumber => $holdfor_patron->cardnumber,
56	);	55	);
57	}	56	}

Lines 73-81 my $biblio = GetBiblioData($biblionumber); Link Here

(-)a/catalogue/labeledMARCdetail.pl (-3 / +2 lines)
73	if($query->cookie("holdfor")){	73	if($query->cookie("holdfor")){
74	my $holdfor_patron = Koha::Patrons->find( $query->cookie("holdfor") );	74	my $holdfor_patron = Koha::Patrons->find( $query->cookie("holdfor") );
75	$template->param(	75	$template->param(
76	holdfor => $query->cookie("holdfor"),	76	holdfor => $query->cookie("holdfor"),
77	holdfor_surname => $holdfor_patron->surname,	77	holdfor_patron => $holdfor_patron,
78	holdfor_firstname => $holdfor_patron->firstname,
79	holdfor_cardnumber => $holdfor_patron->cardnumber,	78	holdfor_cardnumber => $holdfor_patron->cardnumber,
80	);	79	);
81	}	80	}

Lines 55-63 $template->param( Link Here

(-)a/catalogue/moredetail.pl (-3 / +2 lines)
55	if($query->cookie("holdfor")){	55	if($query->cookie("holdfor")){
56	my $holdfor_patron = Koha::Patrons->find( $query->cookie("holdfor") );	56	my $holdfor_patron = Koha::Patrons->find( $query->cookie("holdfor") );
57	$template->param(	57	$template->param(
58	holdfor => $query->cookie("holdfor"),	58	holdfor => $query->cookie("holdfor"),
59	holdfor_surname => $holdfor_patron->surname,	59	holdfor_patron => $holdfor_patron,
60	holdfor_firstname => $holdfor_patron->firstname,
61	holdfor_cardnumber => $holdfor_patron->cardnumber,	60	holdfor_cardnumber => $holdfor_patron->cardnumber,
62	);	61	);
63	}	62	}

Lines 203-211 if($cgi->cookie("holdfor")){ Link Here

(-)a/catalogue/search.pl (-3 / +2 lines)
203	my $holdfor_patron = Koha::Patrons->find( $cgi->cookie("holdfor") );	203	my $holdfor_patron = Koha::Patrons->find( $cgi->cookie("holdfor") );
204	if ( $holdfor_patron ) { # may have been deleted in the meanwhile	204	if ( $holdfor_patron ) { # may have been deleted in the meanwhile
205	$template->param(	205	$template->param(
206	holdfor => $cgi->cookie("holdfor"),	206	holdfor => $cgi->cookie("holdfor"),
207	holdfor_surname => $holdfor_patron->surname,	207	holdfor_patron => $holdfor_patron,
208	holdfor_firstname => $holdfor_patron->firstname,
209	holdfor_cardnumber => $holdfor_patron->cardnumber,	208	holdfor_cardnumber => $holdfor_patron->cardnumber,
210	);	209	);
211	}	210	}

Lines 182-188 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc (-1 / +1 lines)
182	</button>	182	</button>
183	<ul class="dropdown-menu">	183	<ul class="dropdown-menu">
184	<li><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber \| uri %]">Place hold</a></li>	184	<li><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber \| uri %]">Place hold</a></li>
185	<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>	185	<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>
186	</ul>	186	</ul>
187	</div>	187	</div>
188	[% ELSE %]	188	[% ELSE %]




                                        <ul class="dropdown-menu">
                                            <li><a href="#" class="placehold">Place hold</a></li>
                                            [% IF holdfor %]
                                            <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 [% 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>

                                                    [% 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 ( 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>

Lines 276-282 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt (-2 / +1 lines)
276	[% ELSE %]	276	[% ELSE %]
277	[% IF ( itemsloo.ITEM_RESULTS.size ) %]	277	[% IF ( itemsloo.ITEM_RESULTS.size ) %]
278	<a id="reserve_[% itemsloo.biblionumber \| html %]" href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% itemsloo.biblionumber \| html %]">Holds</a>	278	<a id="reserve_[% itemsloo.biblionumber \| html %]" href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% itemsloo.biblionumber \| html %]">Holds</a>
279	[% 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 %]	279	[% 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 %]
280	[% ELSE %]	280	[% ELSE %]
281	<span class="noholdstext">No holds allowed</span>	281	<span class="noholdstext">No holds allowed</span>
282	[% END %]	282	[% END %]
283	-

Return to bug 21978

Lines 143-151 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt (-3 / +3 lines)
143	<ul class="dropdown-menu">	143	<ul class="dropdown-menu">
144	<li><a href="#" class="placehold">Place hold</a></li>	144	<li><a href="#" class="placehold">Place hold</a></li>
145	[% IF holdfor %]	145	[% IF holdfor %]
146	<li><a href="#" class="placeholdfor">Place hold for [% holdfor_firstname \| html %] [% holdfor_surname \| html %] ([% holdfor_cardnumber \| html %])</a></li>	146	<li><a href="#" class="placeholdfor">Place hold for [% INCLUDE 'patron-title.inc' patron => holdfor_patron no_title => 1 no_cardnumber => 1 %]</a></li>
147	<li class="divider"></li>	147	<li class="divider"></li>
148	<li><a href="#" id="forgetholdfor">Forget [% holdfor_firstname \| html %] [% holdfor_surname \| html %] ([% holdfor_cardnumber \| html %])</a></li>	148	<li><a href="#" id="forgetholdfor">Forget [% INCLUDE 'patron-title.inc' patron => holdfor_patron no_title => 1 no_cardnumber => 1 %]</a></li>
149	[% END %]	149	[% END %]
150	[% IF holdforclub %]	150	[% IF holdforclub %]
151	<li><a href="#" class="placeholdforclub">Place hold for [% holdforclub_name \| html %]</a></li>	151	<li><a href="#" class="placeholdforclub">Place hold for [% holdforclub_name \| html %]</a></li>
Lines 519-525 Link Here
519	[% ELSE %]	519	[% ELSE %]
520	[% IF CAN_user_reserveforothers_place_holds %]	520	[% IF CAN_user_reserveforothers_place_holds %]
521	<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>	521	<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>
522	[% 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 %]	522	[% 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 %]
523	[% 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 %]	523	[% 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 %]
524	[% ELSE %]	524	[% ELSE %]
525	<span>Holds ([% Biblio.HoldsCount( SEARCH_RESULT.biblionumber ) \| html %])</span>	525	<span>Holds ([% Biblio.HoldsCount( SEARCH_RESULT.biblionumber ) \| html %])</span>