From 9b5f4003584907fa9e27b333d9b14133057b73bc Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Wed, 28 Oct 2020 16:15:39 +1300 Subject: [PATCH] Bug 19532: (follow-up) Fixing OPAC display and staff client errors - 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 Signed-off-by: David Nind --- circ/circulation.pl | 3 +- .../en/modules/recalls/recalls_to_pull.tt | 3 +- koha-tmpl/intranet-tmpl/prog/js/checkouts.js | 2 +- .../bootstrap/en/modules/opac-recall.tt | 28 ++++++++++++------- .../bootstrap/en/modules/opac-recalls.tt | 24 ++++++++++------ 5 files changed, 36 insertions(+), 24 deletions(-) diff --git a/circ/circulation.pl b/circ/circulation.pl index 063250f8b1..e9ba42491d 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -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'); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_to_pull.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_to_pull.tt index 001813f2b7..70e8f009f7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_to_pull.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_to_pull.tt @@ -61,8 +61,7 @@ [% recall.patrons_count | html %] [% recall.first_recall.patron.firstname | html %] [% recall.first_recall.patron.surname | html %] - [% 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 %] diff --git a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js index b0ddadbccc..e0620920b4 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js +++ b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js @@ -467,7 +467,7 @@ $(document).ready(function() { // Do nothing } else if ( oObj.can_renew_error == "recalled" ) { msg += "" - + "" + RECALLED + "" + + "" + __("Recalled") + "" + ""; span_style = "display: none"; diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt index 83d4793479..258019e6e0 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt @@ -13,20 +13,28 @@ [% INCLUDE 'masthead.inc' %]
- +
-
-
+
+
-
+

Confirm recalls for: [% INCLUDE 'patron-title.inc' patron = logged_in_user %] ([% logged_in_user.cardnumber | html %])

[% IF nosyspref %] @@ -163,8 +171,8 @@ [% END %] [% END %]
-
-
+
+
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt index e6520366fe..3f3dff0762 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt @@ -8,18 +8,24 @@ [% INCLUDE 'bodytag.inc' bodyid='opac-recalls' bodyclass='scrollto' %] [% INCLUDE 'masthead.inc' %]
- +
-
-
+
+
-
+

Recalls history

[% IF Koha.Preference('UseRecalls') %] @@ -125,8 +131,8 @@ Recalls have not been enabled. Please contact your library. [% END %]
-
-
+
+
-- 2.20.1