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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-patron-search-results.inc (-3 / +10 lines)
Lines 13-24 Link Here
13
    </thead>
13
    </thead>
14
    <tbody>
14
    <tbody>
15
        [% FOREACH borrower IN borrowers %]
15
        [% FOREACH borrower IN borrowers %]
16
            [% IF ( destination == "circ" ) %]
16
            [% IF destination == "circ" %]
17
                <tr class="clickable" data-url="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrower.borrowernumber %]">
17
                <tr class="clickable" data-url="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrower.borrowernumber %]">
18
                    <td><a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrower.borrowernumber %]">[% borrower.surname %], [% borrower.firstname %]</a></td>
18
                    <td><a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrower.borrowernumber %]">[% borrower.surname %], [% borrower.firstname %]</a></td>
19
            [% ELSIF destination == "holds" %]
20
                [% IF multi_hold %]
21
                    [% SET data_url = "/cgi-bin/koha/reserve/request.pl?borrowernumber=" _ borrower.borrowernumber _ "&amp;multi_hold=1&amp;biblionumbers=" _ biblionumbers %]
22
                [% ELSE %]
23
                    [% SET data_url = "/cgi-bin/koha/reserve/request.pl?borrowernumber=" _ borrower.borrowernumber _ "&amp;biblionumber=" _ biblionumber %]
24
                [% END %]
25
                <tr class="clickable" data-url="[% data_url %]">
26
                    <td><a href="[% data_url %]">[% borrower.surname %], [% borrower.firstname %]</a></td>
19
            [% ELSE %]
27
            [% ELSE %]
20
                <tr class="clickable" data-url="/cgi-bin/koha/reserve/request.pl?borrowernumber=[% borrower.borrowernumber %]&amp;biblionumber=[% biblionumber %]">
28
                [%# This does not exist %]
21
                    <td><a href="/cgi-bin/koha/reserve/request.pl?borrowernumber=[% borrower.borrowernumber %]&amp;biblionumber=[% biblionumber %]">[% borrower.surname %], [% borrower.firstname %]</a></td>
22
            [% END %]
29
            [% END %]
23
                <td>[% borrower.cardnumber %]</td>
30
                <td>[% borrower.cardnumber %]</td>
24
                <td>[% borrower.dateofbirth | $KohaDates %]</td>
31
                <td>[% borrower.dateofbirth | $KohaDates %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt (+5 lines)
Lines 277-283 function checkMultiHold() { Link Here
277
                <div class="hint">Enter patron card number or partial name:</div>
277
                <div class="hint">Enter patron card number or partial name:</div>
278
                <input type="text" size="40" id="patron" class="focus" name="findborrower" />
278
                <input type="text" size="40" id="patron" class="focus" name="findborrower" />
279
                <input type="submit" value="Search" />
279
                <input type="submit" value="Search" />
280
            [% IF multi_hold %]
281
                <input type="hidden" name="multi_hold" value="[% multi_hold %]"/>
282
                <input type="hidden" name="biblionumbers" value="[% biblionumbers %]"/>
283
            [% ELSE %]
280
                <input type="hidden" name="biblionumber" value="[% biblionumber %]" />
284
                <input type="hidden" name="biblionumber" value="[% biblionumber %]" />
285
            [% END %]
281
            </fieldset>
286
            </fieldset>
282
        [% ELSE %]
287
        [% ELSE %]
283
            [% INCLUDE 'circ-patron-search-results.inc' destination = "holds" %]
288
            [% INCLUDE 'circ-patron-search-results.inc' destination = "holds" %]
(-)a/reserve/request.pl (-8 / +4 lines)
Lines 65-72 my ( $template, $borrowernumber, $cookie, $flags ) = get_template_and_user( Link Here
65
    }
65
    }
66
);
66
);
67
67
68
my $multihold = $input->param('multi_hold');
69
$template->param(multi_hold => $multihold);
70
my $showallitems = $input->param('showallitems');
68
my $showallitems = $input->param('showallitems');
71
69
72
my $itemtypes = { map { $_->{itemtype} => $_ } @{ Koha::ItemTypes->search_with_localization->unblessed } };
70
my $itemtypes = { map { $_->{itemtype} => $_ } @{ Koha::ItemTypes->search_with_localization->unblessed } };
Lines 127-139 if ($findborrower) { Link Here
127
}
125
}
128
126
129
my @biblionumbers = ();
127
my @biblionumbers = ();
128
my $biblionumber = $input->param('biblionumber');
130
my $biblionumbers = $input->param('biblionumbers');
129
my $biblionumbers = $input->param('biblionumbers');
131
if ($multihold) {
130
if ( $biblionumbers ) {
132
    @biblionumbers = split '/', $biblionumbers;
131
    @biblionumbers = split '/', $biblionumbers;
133
} else {
132
} else {
134
    push @biblionumbers, $input->multi_param('biblionumber');
133
    push @biblionumbers, $input->multi_param('biblionumber');
135
}
134
}
136
135
136
# FIXME multi_hold should not be a variable but depends on the number of elements in @biblionumbers
137
$template->param(multi_hold => scalar $input->param('multi_hold'));
137
138
138
# If we have the borrowernumber because we've performed an action, then we
139
# If we have the borrowernumber because we've performed an action, then we
139
# don't want to try to place another reserve.
140
# don't want to try to place another reserve.
Lines 627-636 $template->param( biblionumbers => $biblionumbers ); Link Here
627
$template->param( exceeded_maxreserves => $exceeded_maxreserves );
628
$template->param( exceeded_maxreserves => $exceeded_maxreserves );
628
$template->param( exceeded_holds_per_record => $exceeded_holds_per_record );
629
$template->param( exceeded_holds_per_record => $exceeded_holds_per_record );
629
630
630
if ($multihold) {
631
    $template->param( multi_hold => 1 );
632
}
633
634
if ( C4::Context->preference( 'AllowHoldDateInFuture' ) ) {
631
if ( C4::Context->preference( 'AllowHoldDateInFuture' ) ) {
635
    $template->param( reserve_in_future => 1 );
632
    $template->param( reserve_in_future => 1 );
636
}
633
}
637
- 

Return to bug 18474