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

(-)a/circ/circulation.pl (-2 / +1 lines)
Lines 174-180 if ( $restoreduedatespec && $restoreduedatespec eq "highholds_empty" ) { Link Here
174
my $issueconfirmed = $query->param('issueconfirmed');
174
my $issueconfirmed = $query->param('issueconfirmed');
175
my $cancelreserve  = $query->param('cancelreserve');
175
my $cancelreserve  = $query->param('cancelreserve');
176
my $cancel_recall  = $query->param('cancel_recall');
176
my $cancel_recall  = $query->param('cancel_recall');
177
my $recall_id     = $query->param('recall_id');
177
my $recall_id      = $query->param('recall_id');
178
my $debt_confirmed = $query->param('debt_confirmed') || 0; # Don't show the debt error dialog twice
178
my $debt_confirmed = $query->param('debt_confirmed') || 0; # Don't show the debt error dialog twice
179
my $charges        = $query->param('charges') || q{};
179
my $charges        = $query->param('charges') || q{};
180
180
Lines 394-400 if (@$barcodes) { Link Here
394
        }
394
        }
395
        unless($confirm_required) {
395
        unless($confirm_required) {
396
            my $switch_onsite_checkout = exists $messages->{ONSITE_CHECKOUT_WILL_BE_SWITCHED};
396
            my $switch_onsite_checkout = exists $messages->{ONSITE_CHECKOUT_WILL_BE_SWITCHED};
397
            my $recall_id = $messages->{RECALLED};
398
            my $issue = AddIssue( $patron->unblessed, $barcode, $datedue, $cancelreserve, undef, undef, { onsite_checkout => $onsite_checkout, auto_renew => $session->param('auto_renew'), switch_onsite_checkout => $switch_onsite_checkout, cancel_recall => $cancel_recall, recall_id => $recall_id, } );
397
            my $issue = AddIssue( $patron->unblessed, $barcode, $datedue, $cancelreserve, undef, undef, { onsite_checkout => $onsite_checkout, auto_renew => $session->param('auto_renew'), switch_onsite_checkout => $switch_onsite_checkout, cancel_recall => $cancel_recall, recall_id => $recall_id, } );
399
            $template_params->{issue} = $issue;
398
            $template_params->{issue} = $issue;
400
            $session->clear('auto_renew');
399
            $session->clear('auto_renew');
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_to_pull.tt (-2 / +1 lines)
Lines 61-68 Link Here
61
                            <td class="recall-patrons">[% recall.patrons_count | html %]</td>
61
                            <td class="recall-patrons">[% recall.patrons_count | html %]</td>
62
                            <td class="recall-firstpatron"><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% recall.first_recall.borrowernumber | uri %]">[% recall.first_recall.patron.firstname | html %] [% recall.first_recall.patron.surname | html %]</a></td>
62
                            <td class="recall-firstpatron"><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% recall.first_recall.borrowernumber | uri %]">[% recall.first_recall.patron.firstname | html %] [% recall.first_recall.patron.surname | html %]</a></td>
63
                            <td class="recall-title">
63
                            <td class="recall-title">
64
                                [% INCLUDE 'biblio-default-view.inc' biblionumber=recall.first_recall.biblio.biblionumber %]
64
                                [% INCLUDE 'biblio-title.inc' biblio=recall.first_recall.biblio link=1 %]
65
                                [% INCLUDE 'biblio-title.inc' biblio=recall.first_recall.biblio %]
66
                                [% IF recall.first_recall.biblio.author %] by [% recall.first_recall.biblio.author | html %][% END %]
65
                                [% IF recall.first_recall.biblio.author %] by [% recall.first_recall.biblio.author | html %][% END %]
67
                            </td>
66
                            </td>
68
                            <td class="recall-libraries">
67
                            <td class="recall-libraries">
(-)a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js (-1 / +1 lines)
Lines 467-473 $(document).ready(function() { Link Here
467
                            // Do nothing
467
                            // Do nothing
468
                        } else if ( oObj.can_renew_error == "recalled" ) {
468
                        } else if ( oObj.can_renew_error == "recalled" ) {
469
                            msg += "<span>"
469
                            msg += "<span>"
470
                                    + "<a href='/cgi-bin/koha/recalls/request.pl?biblionumber=" + oObj.biblionumber + "'>" + RECALLED + "</a>"
470
                                    + "<a href='/cgi-bin/koha/recalls/request.pl?biblionumber=" + oObj.biblionumber + "'>" + __("Recalled") + "</a>"
471
                                    + "</span>";
471
                                    + "</span>";
472
472
473
                            span_style = "display: none";
473
                            span_style = "display: none";
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt (-10 / +18 lines)
Lines 13-32 Link Here
13
[% INCLUDE 'masthead.inc' %]
13
[% INCLUDE 'masthead.inc' %]
14
14
15
<div class="main">
15
<div class="main">
16
    <ul class="breadcrumb">
16
    <nav aria-label="breadcrumb">
17
        <li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">&rsaquo;</span></li>
17
        <ul class="breadcrumb">
18
        <li><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | uri %]">Details for: [% biblio.title | html %]</a> <span class="divider">&rsaquo;</span></li>
18
            <li class="breadcrumb-item">
19
        <li><a href="/cgi-bin/koha/opac-recall.pl?biblionumber=[% biblio.biblionumber | uri %]">Place recall</a></li>
19
                <a href="/cgi-bin/koha/opac-main.pl">Home</a>
20
    </ul>
20
            </li>
21
            <li class="breadcrumb-item">
22
                <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | uri %]">Details for: [% biblio.title | html %]</a>
23
            </li>
24
            <li class="breadcrumb-item">
25
                <a href="/cgi-bin/koha/opac-recall.pl?biblionumber=[% biblio.biblionumber | uri %]">Place recall</a>
26
            </li>
27
        </ul>
28
    </nav>
21
29
22
    <div class="container-fluid">
30
    <div class="container-fluid">
23
        <div class="row-fluid">
31
        <div class="row">
24
            <div class="span2">
32
            <div class="col col-lg-2 order-2 order-lg-1">
25
                <div id="navigation">
33
                <div id="navigation">
26
                    [% INCLUDE 'navigation.inc' IsPatronPage=1 %]
34
                    [% INCLUDE 'navigation.inc' IsPatronPage=1 %]
27
                </div>
35
                </div>
28
            </div>
36
            </div>
29
            <div class="span10">
37
            <div class="col-md-12 col-lg-10 order-1 order-lg-2">
30
                <div id="recall" class="maincontent">
38
                <div id="recall" class="maincontent">
31
                    <h1>Confirm recalls for: [% INCLUDE 'patron-title.inc' patron = logged_in_user %] ([% logged_in_user.cardnumber | html %])</h1>
39
                    <h1>Confirm recalls for: [% INCLUDE 'patron-title.inc' patron = logged_in_user %] ([% logged_in_user.cardnumber | html %])</h1>
32
                    [% IF nosyspref %]
40
                    [% IF nosyspref %]
Lines 163-170 Link Here
163
                        [% END %]
171
                        [% END %]
164
                    [% END %] <!-- norecalls -->
172
                    [% END %] <!-- norecalls -->
165
                </div> <!-- / #recall -->
173
                </div> <!-- / #recall -->
166
            </div> <!-- / .span10 -->
174
            </div> <!-- / .col-md-12 -->
167
        </div> <!-- / .row-fluid -->
175
        </div> <!-- / .row -->
168
    </div>  <!-- / .container-fluid -->
176
    </div>  <!-- / .container-fluid -->
169
</div> <!-- / .main -->
177
</div> <!-- / .main -->
170
178
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt (-10 / +15 lines)
Lines 8-25 Link Here
8
[% INCLUDE 'bodytag.inc' bodyid='opac-recalls' bodyclass='scrollto' %]
8
[% INCLUDE 'bodytag.inc' bodyid='opac-recalls' bodyclass='scrollto' %]
9
[% INCLUDE 'masthead.inc' %]
9
[% INCLUDE 'masthead.inc' %]
10
<div class="main">
10
<div class="main">
11
    <ul class="breadcrumb">
11
    <nav aria-label="breadcrumb">
12
        <li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">&rsaquo;</span></li>
12
        <ul class="breadcrumb">
13
        <li><a href="#">Your recalls history</a></li>
13
            <li class="breadcrumb-item">
14
    </ul>
14
                <a href="/cgi-bin/koha/opac-main.pl">Home</a>
15
            </li>
16
            <li class="breadcrumb-item">
17
                <a href="#">Your recalls history</a>
18
            </li>
19
        </ul>
20
    </nav>
15
    <div class="container-fluid">
21
    <div class="container-fluid">
16
        <div class="row-fluid">
22
        <div class="row">
17
            <div class="span2">
23
            <div class="col col-lg-2 order-2 order-lg-1">
18
                <div id="navigation">
24
                <div id="navigation">
19
                    [% INCLUDE 'navigation.inc' IsPatronPage=1 %]
25
                    [% INCLUDE 'navigation.inc' IsPatronPage=1 %]
20
                </div>
26
                </div>
21
            </div>
27
            </div>
22
            <div class="span10">
28
            <div class="col-md-12 col-lg-10 order-1 order-lg-2">
23
                <div id="recalls" class="maincontent">
29
                <div id="recalls" class="maincontent">
24
                    <h2>Recalls history</h2>
30
                    <h2>Recalls history</h2>
25
                    [% IF Koha.Preference('UseRecalls') %]
31
                    [% IF Koha.Preference('UseRecalls') %]
Lines 125-132 Link Here
125
                            Recalls have not been enabled. Please contact your library.
131
                            Recalls have not been enabled. Please contact your library.
126
                        [% END %]
132
                        [% END %]
127
                        </div> <!-- /#recalls -->
133
                        </div> <!-- /#recalls -->
128
                    </div> <!-- /.span10 -->
134
                    </div> <!-- /.col-md-12 -->
129
            </div> <!-- /.row-fluid -->
135
            </div> <!-- /.row -->
130
        </div> <!-- /.container-fluid -->
136
        </div> <!-- /.container-fluid -->
131
</div> <!-- /#main -->
137
</div> <!-- /#main -->
132
138
133
- 

Return to bug 19532