Attachment 77370 Details for Bug 21137 – Bug 21137: use logged_in_user from opac-user.pl

[patch] Bug 21137: use logged_in_user from opac-user.pl

Bug-21137-use-loggedinuser-from-opac-userpl.patch (text/plain), 7.36 KB, created by Jonathan Druart on 2018-08-01 14:10:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2018-08-01 14:10:29 UTC

Size: 7.36 KB

patch

obsolete

>From 89daf3cddf3749b2d91b5ff10393d68545bf9150 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Wed, 1 Aug 2018 11:08:09 -0300
>Subject: [PATCH] Bug 21137: use logged_in_user from opac-user.pl
>
>---
> .../opac-tmpl/bootstrap/en/modules/opac-user.tt    | 22 +++++++++++-----------
> 1 file changed, 11 insertions(+), 11 deletions(-)
>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
>index fb904159fe..973baa675f 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
>@@ -5,8 +5,8 @@
> [% USE ItemTypes %]
> [% USE Price %]
> 
>-[% SET borrower_club_enrollments =  borrower.get_club_enrollments(1) %]
>-[% SET borrower_enrollable_clubs = borrower.get_enrollable_clubs(1,1) %]
>+[% SET borrower_club_enrollments =  logged_in_user.get_club_enrollments(1) %]
>+[% SET borrower_enrollable_clubs = logged_in_user.get_enrollable_clubs(1,1) %]
> 
> [% INCLUDE 'doc-head-open.inc' %]
> <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your library home</title>
>@@ -159,7 +159,7 @@
>                             [% END %]
> 
>                             [% IF ( RESERVES.count ) %]<li><a href="#opac-user-holds">Holds ([% RESERVES.count %])</a></li>[% END %]
>-                            [% IF Koha.Preference('ArticleRequests') && borrower.article_requests_current %]<li><a href="#opac-user-article-requests">Article requests ([% borrower.article_requests_current.count %])</a></li>[% END %]
>+                            [% IF Koha.Preference('ArticleRequests') && logged_in_user.article_requests_current %]<li><a href="#opac-user-article-requests">Article requests ([% logged_in_user.article_requests_current.count %])</a></li>[% END %]
>                             [% IF ( OverDriveCirculation ) %]
>                             <li><a href="#opac-user-overdrive">OverDrive Account</a></li>
>                             [% END %]
>@@ -187,7 +187,7 @@
>                                                     <th>Barcode</th>
>                                                 [% END %]
>                                                     <th>Call no.</th>
>-                                                [% IF ( OpacRenewalAllowed && !( borrower.is_expired && borrower.category.effective_BlockExpiredPatronOpacActions ) ) %]
>+                                                [% IF ( OpacRenewalAllowed && !( logged_in_user.is_expired && logged_in_user.category.effective_BlockExpiredPatronOpacActions ) ) %]
>                                                     <th class="nosort">Renew</th>
>                                                 [% END %]
>                                                 [% IF ( OPACFinesTab ) %]
>@@ -280,7 +280,7 @@
>                                                     <span class="tdlabel">Call no.:</span>
>                                                     [% ISSUE.itemcallnumber %]
>                                                 </td>
>-                                                [% IF ( OpacRenewalAllowed && !( borrower.is_expired && borrower.category.effective_BlockExpiredPatronOpacActions ) ) %]
>+                                                [% IF ( OpacRenewalAllowed && !( logged_in_user.is_expired && logged_in_user.category.effective_BlockExpiredPatronOpacActions ) ) %]
>                                                     <td class="renew">
>                                                     [% IF ISSUE.renewed %]<span class="blabel label-success">Renewed!</span><br />[% END %]
>                                                     [% IF ( ISSUE.status ) %]
>@@ -340,12 +340,12 @@
>                                         [% END # /FOREACH ISSUES %]
>                                     </tbody>
>                                 </table>
>-                                [% IF ( canrenew && !userdebarred && OpacRenewalAllowed && !( borrower.is_expired && borrower.category.effective_BlockExpiredPatronOpacActions ) ) %]
>+                                [% IF ( canrenew && !userdebarred && OpacRenewalAllowed && !( logged_in_user.is_expired && logged_in_user.category.effective_BlockExpiredPatronOpacActions ) ) %]
>                                     <input type="submit" class="btn" value="Renew selected" />
>                                 [% END %]
>                                 </form>
> 
>-                                [% IF ( canrenew && !userdebarred && OpacRenewalAllowed && !( borrower.is_expired && borrower.category.effective_BlockExpiredPatronOpacActions ) ) %]
>+                                [% IF ( canrenew && !userdebarred && OpacRenewalAllowed && !( logged_in_user.is_expired && logged_in_user.category.effective_BlockExpiredPatronOpacActions ) ) %]
>                                 <form id="renewall" action="/cgi-bin/koha/opac-renew.pl" method="post">
>                                     <input type="hidden" name="from" value="opac_user" />
>                                     <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
>@@ -791,9 +791,9 @@
> 
>                         [% IF Koha.Preference('ArticleRequests') %]
>                             <div id="opac-user-article-requests">
>-                                [% IF borrower.article_requests_current.count %]
>+                                [% IF logged_in_user.article_requests_current.count %]
>                                     <table id="article-requests-table" class="table table-bordered table-striped">
>-                                        <caption>Article requests <span class="count">([% borrower.article_requests_current.count %] total)</span></caption>
>+                                        <caption>Article requests <span class="count">([% logged_in_user.article_requests_current.count %] total)</span></caption>
>                                         <thead>
>                                             <tr>
>                                                 <th class="anti-the article-request-record-title">Record title</th>
>@@ -813,7 +813,7 @@
>                                         </thead>
> 
>                                         <tbody>
>-                                        [% FOREACH ar IN borrower.article_requests_current %]
>+                                        [% FOREACH ar IN logged_in_user.article_requests_current %]
>                                                 <td class="article-request-record-title">
>                                                     <a class="article-request-title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% ar.biblionumber %]">
>                                                         [% ar.biblio.title %]
>@@ -957,7 +957,7 @@
>                     e.preventDefault();
>                     $("#renewall").submit();
>                 });
>-                [% IF ( canrenew && !userdebarred && OpacRenewalAllowed && !( borrower.is_expired && borrower.category.effective_BlockExpiredPatronOpacActions ) ) %]
>+                [% IF ( canrenew && !userdebarred && OpacRenewalAllowed && !( logged_in_user.is_expired && logged_in_user.category.effective_BlockExpiredPatronOpacActions ) ) %]
>                     $("#checkoutst caption").append("<div id=\"renewcontrols\"><a id=\"renewselected_link\" href=\"#\">"+_("Renew selected")+"</a> <a id=\"renewall_link\" href=\"#\">"+_("Renew all")+"</a></div>");
>                 [% END %]
>             [% END %]
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 21137: 77364 | 77365 | 77369 | 77370 | 77371 | 77376 | 77377 | 77378 | 77397 | 77398 | 77399 | 77400 | 77401 | 77402 | 77403 | 77404