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

(-)a/catalogue/ISBDdetail.pl (-3 / +1 lines)
Lines 109-117 if($query->cookie("holdfor")){ Link Here
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,
115
    );
113
    );
116
}
114
}
117
115
(-)a/catalogue/MARCdetail.pl (-3 / +1 lines)
Lines 111-119 if($query->cookie("holdfor")){ Link Here
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,
117
    );
115
    );
118
}
116
}
119
117
(-)a/catalogue/detail.pl (-3 / +1 lines)
Lines 104-112 if($query->cookie("holdfor")){ Link Here
104
        $template->param(
104
        $template->param(
105
            # FIXME Should pass the patron object
105
            # FIXME Should pass the patron object
106
            holdfor => $query->cookie("holdfor"),
106
            holdfor => $query->cookie("holdfor"),
107
            holdfor_surname => $holdfor_patron->surname,
107
            holdfor_patron => $holdfor_patron,
108
            holdfor_firstname => $holdfor_patron->firstname,
109
            holdfor_cardnumber => $holdfor_patron->cardnumber,
110
        );
108
        );
111
    }
109
    }
112
}
110
}
(-)a/catalogue/imageviewer.pl (-4 / +2 lines)
Lines 49-58 my @items = GetItemsInfo($biblionumber); Link Here
49
if ( $query->cookie("holdfor") ) {
49
if ( $query->cookie("holdfor") ) {
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,
56
    );
54
    );
57
}
55
}
58
56
(-)a/catalogue/labeledMARCdetail.pl (-3 / +1 lines)
Lines 74-82 if($query->cookie("holdfor")){ Link Here
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,
80
    );
78
    );
81
}
79
}
82
80
(-)a/catalogue/moredetail.pl (-3 / +1 lines)
Lines 56-64 if($query->cookie("holdfor")){ Link Here
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,
62
    );
60
    );
63
}
61
}
64
62
(-)a/catalogue/search.pl (-3 / +1 lines)
Lines 197-205 if($cgi->cookie("holdfor")){ Link Here
197
    if ( $holdfor_patron ) { # may have been deleted in the meanwhile
197
    if ( $holdfor_patron ) { # may have been deleted in the meanwhile
198
        $template->param(
198
        $template->param(
199
            holdfor => $cgi->cookie("holdfor"),
199
            holdfor => $cgi->cookie("holdfor"),
200
            holdfor_surname => $holdfor_patron->surname,
200
            holdfor_patron => $holdfor_patron,
201
            holdfor_firstname => $holdfor_patron->firstname,
202
            holdfor_cardnumber => $holdfor_patron->cardnumber,
203
        );
201
        );
204
    }
202
    }
205
}
203
}
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc (-1 / +1 lines)
Lines 180-186 Link Here
180
                </button>
180
                </button>
181
                <ul class="dropdown-menu">
181
                <ul class="dropdown-menu">
182
                    <li><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber | uri %]">Place hold</a></li>
182
                    <li><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber | uri %]">Place hold</a></li>
183
                    <li><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber | uri %]&amp;findborrower=[% holdfor_cardnumber | uri %]">Place hold for [% holdfor_firstname | html %] [% holdfor_surname | html %] ([% holdfor_cardnumber | html %])</a></li>
183
                    <li><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber | uri %]&amp;findborrower=[% holdfor_patron.cardnumber || holdfor.borrowernumber | uri %]">Place hold for [% INCLUDE 'patron-title.inc' patron => holdfor_patron %]</a></li>
184
                </ul>
184
                </ul>
185
            </div>
185
            </div>
186
        [% ELSE %]
186
        [% ELSE %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt (-4 / +4 lines)
Lines 146-154 Link Here
146
                                        <ul class="dropdown-menu">
146
                                        <ul class="dropdown-menu">
147
                                            <li><a href="#" class="placehold">Place hold</a></li>
147
                                            <li><a href="#" class="placehold">Place hold</a></li>
148
                                            [% IF holdfor %]
148
                                            [% IF holdfor %]
149
                                                <li><a href="#" class="placeholdfor">Place hold for [% holdfor_firstname | html %] [% holdfor_surname | html %] ([% holdfor_cardnumber | html %])</a></li>
149
                                                <li><a href="#" class="placeholdfor">Place hold for [% INCLUDE 'patron-title.inc' patron => holdfor_patron %]</a></li>
150
                                                <li class="divider"></li>
150
                                                <li class="divider"></li>
151
                                                <li><a href="#" id="forgetholdfor">Forget  [% holdfor_firstname | html %] [% holdfor_surname | html %] ([% holdfor_cardnumber | html %])</a></li>
151
                                                <li><a href="#" id="forgetholdfor">Forget [% INCLUDE 'patron-title.inc' patron => holdfor_patron %]</a></li>
152
                                            [% END %]
152
                                            [% END %]
153
                                            [% IF holdforclub %]
153
                                            [% IF holdforclub %]
154
                                                <li><a href="#" class="placeholdforclub">Place hold for [% holdforclub_name | html %]</a></li>
154
                                                <li><a href="#" class="placeholdforclub">Place hold for [% holdforclub_name | html %]</a></li>
Lines 504-510 Link Here
504
                                                    [% ELSE %]
504
                                                    [% ELSE %]
505
                                                        [% IF CAN_user_reserveforothers_place_holds %]
505
                                                        [% IF CAN_user_reserveforothers_place_holds %]
506
                                                            <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>
506
                                                            <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>
507
                                                            [% 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 [% holdfor_firstname | html %] [% holdfor_surname | html %] ([% holdfor_cardnumber | html %])</a></span>[% END %]
507
                                                            [% IF ( holdfor ) %] <span class="holdforlink">| <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]&amp;findborrower=[% holdfor_patron.cardnumber || holdfor_patron.borrowernumber | uri %]">Place hold for [% INCLUDE 'patron-title.inc' patron => holdfor_patron %]</a></span>[% END %]
508
                                                            [% 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 %]
508
                                                            [% 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 %]
509
                                                        [% ELSE %]
509
                                                        [% ELSE %]
510
                                                            Holds ([% Biblio.HoldsCount( SEARCH_RESULT.biblionumber ) | html %])
510
                                                            Holds ([% Biblio.HoldsCount( SEARCH_RESULT.biblionumber ) | html %])
Lines 707-713 Link Here
707
        var PREF_BrowseResultSelection = parseInt( "[% Koha.Preference('BrowseResultSelection') | html %]", 10);
707
        var PREF_BrowseResultSelection = parseInt( "[% Koha.Preference('BrowseResultSelection') | html %]", 10);
708
        var PREF_NotHighlightedWords = "[% Koha.Preference('NotHighlightedWords') | html %]";
708
        var PREF_NotHighlightedWords = "[% Koha.Preference('NotHighlightedWords') | html %]";
709
        var biblionumber = "[% biblionumber | html %]";
709
        var biblionumber = "[% biblionumber | html %]";
710
        var holdfor_cardnumber = "[% holdfor_cardnumber | html %]";
710
        var holdfor_id = "[% holdfor_patron.cardnumber || holdfor_patron.borrowernumber | html %]";
711
        var holdforclub = "[% holdforclub | html %]";
711
        var holdforclub = "[% holdforclub | html %]";
712
        [% IF SEARCH_RESULTS %]
712
        [% IF SEARCH_RESULTS %]
713
            var SEARCH_RESULTS = 1;
713
            var SEARCH_RESULTS = 1;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt (-1 / +1 lines)
Lines 274-280 Link Here
274
                        [% ELSE %]
274
                        [% ELSE %]
275
                            [% IF ( itemsloo.ITEM_RESULTS.size ) %]
275
                            [% IF ( itemsloo.ITEM_RESULTS.size ) %]
276
                                <a id="reserve_[% itemsloo.biblionumber | html %]" href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% itemsloo.biblionumber | html %]">Holds</a>
276
                                <a id="reserve_[% itemsloo.biblionumber | html %]" href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% itemsloo.biblionumber | html %]">Holds</a>
277
                                [% 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 [% holdfor_firstname | html %] [% holdfor_surname | html %] ([% holdfor_cardnumber | html %])</a></span>[% END %]
277
                                [% IF ( holdfor ) %] <span class="holdforlink">| <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% itemsloo.biblionumber | uri %]&amp;findborrower=[% holdfor_patron.cardnumber || holdfor_patron.borrowernumber | uri %]">Place hold for [% INCLUDE 'patron-title.inc' patron => holdfor_patron %]</a></span>[% END %]
278
                            [% ELSE %]
278
                            [% ELSE %]
279
                                <span class="noholdstext">No holds allowed</span>
279
                                <span class="noholdstext">No holds allowed</span>
280
                            [% END %]
280
                            [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/js/pages/results.js (-3 / +2 lines)
Lines 1-4 Link Here
1
/* 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 __ */
1
/* 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 __ */
2
2
3
function verify_cover_images() {
3
function verify_cover_images() {
4
    /* Loop over each container in the template which contains covers */
4
    /* Loop over each container in the template which contains covers */
Lines 396-402 function holdfor(){ Link Here
396
}
396
}
397
397
398
function holdForPatron() {
398
function holdForPatron() {
399
    $("#holdFor").val( holdfor_cardnumber );
399
    $("#holdFor").val( holdfor_id );
400
    placeHold();
400
    placeHold();
401
}
401
}
402
402
403
- 

Return to bug 29396