Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 19532: (follow-up) Fixing OPAC display and staff client errors

Browse source 
- fixes the displays of opac-recalls.pl and opac-recall.pl
- fix the error on Recalls to pull page
- fix JS error preventing Recalled link from showing in checkouts table
- fix cancelling of recall when checking out item

Signed-off-by: David Nind <david@davidnind.com>

Signed-off-by: David Nind <david@davidnind.com>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
This commit is contained in:
Aleisha Amohia 2020-10-28 16:15:39 +13:00 committed by Fridolin Somers
parent ffba7843d3
commit 1e24de67b4
5 changed files with 36 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
circ/circulation.pl
View file

@ -174,7 +174,7 @@ if ( $restoreduedatespec && $restoreduedatespec eq "highholds_empty" ) {
my $issueconfirmed = $query->param('issueconfirmed');
my $cancelreserve = $query->param('cancelreserve');
my $cancel_recall = $query->param('cancel_recall');
my $recall_id = $query->param('recall_id');
my $recall_id = $query->param('recall_id');
my $debt_confirmed = $query->param('debt_confirmed') || 0; # Don't show the debt error dialog twice
my $charges = $query->param('charges') || q{};
@ -394,7 +394,6 @@ if (@$barcodes) {
}
unless($confirm_required) {
my $switch_onsite_checkout = exists $messages->{ONSITE_CHECKOUT_WILL_BE_SWITCHED};
my $recall_id = $messages->{RECALLED};
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, } );
$template_params->{issue} = $issue;
$session->clear('auto_renew');

3
koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_to_pull.tt
View file

@ -61,8 +61,7 @@
<td class="recall-patrons">[% recall.patrons_count | html %]</td>
<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>
<td class="recall-title">
[% INCLUDE 'biblio-default-view.inc' biblionumber=recall.first_recall.biblio.biblionumber %]
[% INCLUDE 'biblio-title.inc' biblio=recall.first_recall.biblio %]
[% INCLUDE 'biblio-title.inc' biblio=recall.first_recall.biblio link=1 %]
[% IF recall.first_recall.biblio.author %] by [% recall.first_recall.biblio.author | html %][% END %]
</td>
<td class="recall-libraries">

2
koha-tmpl/intranet-tmpl/prog/js/checkouts.js
View file

@ -467,7 +467,7 @@ $(document).ready(function() {
// Do nothing
} else if ( oObj.can_renew_error == "recalled" ) {
msg += "<span>"
+ "<a href='/cgi-bin/koha/recalls/request.pl?biblionumber=" + oObj.biblionumber + "'>" + RECALLED + "</a>"
+ "<a href='/cgi-bin/koha/recalls/request.pl?biblionumber=" + oObj.biblionumber + "'>" + __("Recalled") + "</a>"
+ "</span>";
span_style = "display: none";

28
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt
View file

@ -13,20 +13,28 @@
[% INCLUDE 'masthead.inc' %]
<div class="main">
<ul class="breadcrumb">
<li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">&rsaquo;</span></li>
<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>
<li><a href="/cgi-bin/koha/opac-recall.pl?biblionumber=[% biblio.biblionumber | uri %]">Place recall</a></li>
</ul>
<nav aria-label="breadcrumb">
<ul class="breadcrumb">
<li class="breadcrumb-item">
<a href="/cgi-bin/koha/opac-main.pl">Home</a>
</li>
<li class="breadcrumb-item">
<a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | uri %]">Details for: [% biblio.title | html %]</a>
</li>
<li class="breadcrumb-item">
<a href="/cgi-bin/koha/opac-recall.pl?biblionumber=[% biblio.biblionumber | uri %]">Place recall</a>
</li>
</ul>
</nav>
<div class="container-fluid">
<div class="row-fluid">
<div class="span2">
<div class="row">
<div class="col col-lg-2 order-2 order-lg-1">
<div id="navigation">
[% INCLUDE 'navigation.inc' IsPatronPage=1 %]
</div>
</div>
<div class="span10">
<div class="col-md-12 col-lg-10 order-1 order-lg-2">
<div id="recall" class="maincontent">
<h1>Confirm recalls for: [% INCLUDE 'patron-title.inc' patron = logged_in_user %] ([% logged_in_user.cardnumber | html %])</h1>
[% IF nosyspref %]
@ -163,8 +171,8 @@
[% END %]
[% END %] <!-- norecalls -->
</div> <!-- / #recall -->
</div> <!-- / .span10 -->
</div> <!-- / .row-fluid -->
</div> <!-- / .col-md-12 -->
</div> <!-- / .row -->
</div> <!-- / .container-fluid -->
</div> <!-- / .main -->

24
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt
View file

@ -8,18 +8,24 @@
[% INCLUDE 'bodytag.inc' bodyid='opac-recalls' bodyclass='scrollto' %]
[% INCLUDE 'masthead.inc' %]
<div class="main">
<ul class="breadcrumb">
<li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">&rsaquo;</span></li>
<li><a href="#">Your recalls history</a></li>
</ul>
<nav aria-label="breadcrumb">
<ul class="breadcrumb">
<li class="breadcrumb-item">
<a href="/cgi-bin/koha/opac-main.pl">Home</a>
</li>
<li class="breadcrumb-item">
<a href="#">Your recalls history</a>
</li>
</ul>
</nav>
<div class="container-fluid">
<div class="row-fluid">
<div class="span2">
<div class="row">
<div class="col col-lg-2 order-2 order-lg-1">
<div id="navigation">
[% INCLUDE 'navigation.inc' IsPatronPage=1 %]
</div>
</div>
<div class="span10">
<div class="col-md-12 col-lg-10 order-1 order-lg-2">
<div id="recalls" class="maincontent">
<h2>Recalls history</h2>
[% IF Koha.Preference('UseRecalls') %]
@ -125,8 +131,8 @@
Recalls have not been enabled. Please contact your library.
[% END %]
</div> <!-- /#recalls -->
</div> <!-- /.span10 -->
</div> <!-- /.row-fluid -->
</div> <!-- /.col-md-12 -->
</div> <!-- /.row -->
</div> <!-- /.container-fluid -->
</div> <!-- /#main -->