Attachment 131272 Details for Bug 19532 – Bug 19532: (follow-up) Fixing OPAC display and staff client errors

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

Bug-19532-follow-up-Fixing-OPAC-display-and-staff-.patch (text/plain), 8.76 KB, created by Marcel de Rooy on 2022-03-02 15:53:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel de Rooy

Created: 2022-03-02 15:53:30 UTC

Size: 8.76 KB

patch

obsolete

>From 256d45ca3fcffc06c9005fba7939c746a6202da9 Mon Sep 17 00:00:00 2001
>From: Aleisha Amohia <aleishaamohia@hotmail.com>
>Date: Wed, 28 Oct 2020 16:15:39 +1300
>Subject: [PATCH] Bug 19532: (follow-up) Fixing OPAC display and staff client
> errors
>Content-Type: text/plain; charset=utf-8
>
>- 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>
>---
> 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 322d078924..3739b31f3d 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 @@
>                             <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">
>diff --git a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js
>index ae4c50fa9d..2718fec83e 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 += "<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";
>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' %]
> 
> <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 %] 
>                 </div> 
>-            </div> 
>-        </div> 
>+            </div> 
>+        </div> 
>     </div>  
> </div> 
> 
>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' %]
> <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> 
>-                    </div> 
>-            </div> 
>+                    </div> 
>+            </div> 
>         </div> 
> </div> 
> 
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 19532: 68569 | 68570 | 68571 | 68572 | 68642 | 68643 | 68644 | 68645 | 68653 | 69100 | 69102 | 69147 | 69148 | 69149 | 69170 | 69172 | 69221 | 69222 | 69223 | 69322 | 69353 | 69354 | 69405 | 69409 | 69410 | 69411 | 69841 | 69872 | 69873 | 69874 | 69875 | 69876 | 69877 | 69878 | 69879 | 69880 | 69881 | 69882 | 69883 | 69884 | 69885 | 69886 | 69887 | 69888 | 69889 | 69890 | 69986 | 70093 | 71409 | 71574 | 71575 | 71576 | 71577 | 71578 | 71579 | 71580 | 71581 | 71582 | 71583 | 71584 | 71585 | 71586 | 71587 | 71588 | 71589 | 71590 | 71591 | 71592 | 72244 | 72311 | 72312 | 72313 | 72314 | 72315 | 72316 | 72317 | 72318 | 72319 | 72320 | 72321 | 72322 | 72323 | 72324 | 72325 | 72326 | 72327 | 72328 | 72329 | 72330 | 72331 | 72332 | 72333 | 72334 | 72335 | 72336 | 72337 | 72338 | 72527 | 76817 | 76818 | 76819 | 76820 | 76821 | 76822 | 76823 | 76824 | 76825 | 76826 | 76827 | 76828 | 76829 | 76830 | 76831 | 76832 | 76833 | 76834 | 76835 | 76836 | 76837 | 76838 | 76839 | 76840 | 76841 | 76842 | 76843 | 76844 | 76845 | 76846 | 76847 | 77177 | 77178 | 77179 | 78755 | 78757 | 78759 | 78761 | 78763 | 78765 | 78766 | 78768 | 78770 | 78772 | 78773 | 78774 | 78775 | 78776 | 78777 | 78778 | 78780 | 78782 | 78785 | 78787 | 78789 | 78790 | 78792 | 78794 | 78797 | 78800 | 78801 | 78802 | 78803 | 78804 | 78805 | 78806 | 78807 | 78808 | 80763 | 80764 | 80765 | 80766 | 80767 | 80768 | 80769 | 80770 | 80771 | 80772 | 80773 | 80774 | 80775 | 80776 | 80777 | 80778 | 80779 | 80780 | 80781 | 80782 | 80783 | 80784 | 80785 | 80786 | 80787 | 80788 | 80789 | 80793 | 80878 | 81204 | 81205 | 81206 | 81207 | 81208 | 81209 | 81210 | 81211 | 81212 | 81213 | 81214 | 81215 | 81216 | 81217 | 81218 | 81219 | 81220 | 81221 | 81222 | 81223 | 81224 | 81225 | 81226 | 81227 | 81228 | 81229 | 81230 | 81231 | 81232 | 81233 | 81234 | 81235 | 81236 | 81237 | 81238 | 81239 | 81240 | 81241 | 81242 | 81243 | 81244 | 81245 | 81246 | 81247 | 81547 | 81548 | 81549 | 81550 | 81551 | 81552 | 81553 | 81554 | 81555 | 81556 | 81557 | 81558 | 81559 | 81560 | 81561 | 81562 | 81563 | 81564 | 81565 | 81566 | 81567 | 81568 | 81569 | 81583 | 81584 | 81585 | 81586 | 81587 | 81588 | 81595 | 81618 | 81652 | 81653 | 81654 | 81655 | 81656 | 81657 | 81658 | 81659 | 81660 | 81661 | 81662 | 81663 | 81664 | 81665 | 81666 | 81667 | 81668 | 81669 | 81670 | 81671 | 81672 | 81673 | 81674 | 81675 | 81676 | 81677 | 81678 | 81679 | 81680 | 81681 | 81682 | 81683 | 103887 | 103888 | 103890 | 103899 | 103900 | 103901 | 103999 | 104000 | 104001 | 104002 | 104005 | 104006 | 104007 | 104066 | 104067 | 104068 | 104069 | 104070 | 104071 | 104246 | 104247 | 104248 | 104249 | 104250 | 104322 | 104323 | 104324 | 104325 | 104326 | 104327 | 104328 | 104329 | 104330 | 104331 | 104332 | 104333 | 104334 | 104335 | 104336 | 104391 | 104392 | 104393 | 104394 | 104395 | 104396 | 104397 | 104398 | 104474 | 104475 | 104476 | 104477 | 104478 | 104479 | 104480 | 104481 | 104545 | 104546 | 104547 | 104548 | 104549 | 104550 | 104551 | 104552 | 104646 | 104647 | 104648 | 104649 | 104650 | 104651 | 104652 | 104653 | 104722 | 104723 | 104724 | 104725 | 104726 | 104727 | 104728 | 104729 | 104806 | 104807 | 104808 | 104809 | 104810 | 104811 | 104812 | 104813 | 104814 | 104815 | 104816 | 104817 | 104818 | 104819 | 104820 | 104821 | 104863 | 104864 | 104865 | 104866 | 104867 | 104868 | 104869 | 104870 | 104902 | 104903 | 104904 | 104905 | 104906 | 104907 | 104908 | 104909 | 104910 | 104913 | 104914 | 104915 | 104916 | 104917 | 104918 | 104919 | 104920 | 104988 | 104989 | 104990 | 104991 | 104992 | 106268 | 106269 | 106371 | 106372 | 106373 | 106374 | 106375 | 106376 | 106377 | 106378 | 106810 | 106811 | 106812 | 106813 | 106814 | 106815 | 106816 | 106817 | 106857 | 107198 | 107199 | 107200 | 107201 | 107202 | 107203 | 107204 | 107205 | 107807 | 107808 | 107809 | 107810 | 107811 | 107812 | 107813 | 107814 | 107918 | 107919 | 107920 | 107921 | 107922 | 107923 | 107924 | 107925 | 108222 | 108223 | 108224 | 108225 | 108226 | 108227 | 108228 | 108229 | 108980 | 108981 | 108982 | 109306 | 109307 | 109308 | 109309 | 109310 | 109311 | 109312 | 109313 | 109314 | 109315 | 109316 | 109317 | 109318 | 109463 | 109464 | 109465 | 109466 | 109467 | 109468 | 109469 | 109775 | 109776 | 109777 | 109778 | 109779 | 109780 | 109781 | 109782 | 109783 | 109784 | 109785 | 111199 | 111200 | 111201 | 111202 | 111203 | 111204 | 111205 | 111206 | 112316 | 112317 | 112321 | 112322 | 112323 | 112324 | 112325 | 112326 | 112346 | 112472 | 112491 | 112540 | 112612 | 112613 | 112614 | 112615 | 112616 | 112617 | 112618 | 112619 | 112620 | 112621 | 112622 | 113195 | 113196 | 113197 | 113198 | 113199 | 113200 | 113201 | 113202 | 113203 | 113204 | 113205 | 113286 | 113287 | 113288 | 113289 | 113290 | 113291 | 113292 | 113293 | 113294 | 113295 | 113296 | 113297 | 113298 | 113335 | 113351 | 113352 | 113353 | 113354 | 113355 | 113356 | 113357 | 113358 | 113359 | 113361 | 113362 | 113363 | 113364 | 113365 | 113430 | 113431 | 113432 | 113433 | 113434 | 113435 | 113436 | 113437 | 113438 | 113439 | 113440 | 113441 | 113442 | 113443 | 113444 | 113445 | 116121 | 116122 | 116123 | 116124 | 116125 | 116126 | 116127 | 116128 | 116129 | 116130 | 116131 | 116132 | 116133 | 116134 | 118267 | 118268 | 118269 | 118270 | 118271 | 118272 | 118273 | 118274 | 118275 | 118276 | 118277 | 118278 | 118279 | 118280 | 122993 | 122994 | 122995 | 122996 | 122997 | 122998 | 122999 | 123000 | 123001 | 123002 | 123003 | 123004 | 123005 | 126244 | 126245 | 126246 | 126247 | 126248 | 126249 | 126250 | 126251 | 126252 | 126253 | 126254 | 126255 | 126256 | 126257 | 126453 | 126454 | 126455 | 126456 | 126457 | 126458 | 126459 | 126460 | 126469 | 126470 | 126565 | 126566 | 126568 | 126569 | 126570 | 126571 | 126572 | 126573 | 126574 | 126575 | 126576 | 126577 | 126578 | 126579 | 126580 | 129305 | 129306 | 129307 | 129308 | 129309 | 129310 | 129311 | 129312 | 129313 | 129314 | 129315 | 129316 | 129317 | 129318 | 129319 | 130641 | 130642 | 130643 | 130644 | 130645 | 130646 | 130647 | 130648 | 130649 | 130650 | 130651 | 130652 | 130653 | 130654 | 130655 | 130656 | 131108 | 131156 | 131157 | 131158 | 131159 | 131160 | 131193 | 131213 | 131257 | 131260 | 131261 | 131262 | 131263 | 131264 | 131265 | 131266 | 131267 | 131268 | 131269 | 131270 | 131271 | 131272 | 131273 | 131274 | 131275 | 131276 | 131277 | 131278 | 131279 | 131280 | 131281 | 131282 | 131330 | 131629 | 131630 | 131631 | 131664 | 131665 | 131666 | 131701 | 132332