From 27bf38f34f03a5bc26abb8f928a8e37c3486b91e Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 1 Aug 2018 11:08:09 -0300 Subject: [PATCH] Bug 21137: use logged_in_user from opac-user.pl Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens --- .../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 9fa88f7c87..3185ba1dda 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' %] [% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Your library home @@ -159,7 +159,7 @@ [% END %] [% IF ( RESERVES.count ) %]
  • Holds ([% RESERVES.count %])
  • [% END %] - [% IF Koha.Preference('ArticleRequests') && borrower.article_requests_current %]
  • Article requests ([% borrower.article_requests_current.count %])
  • [% END %] + [% IF Koha.Preference('ArticleRequests') && logged_in_user.article_requests_current %]
  • Article requests ([% logged_in_user.article_requests_current.count %])
  • [% END %] [% IF ( OverDriveCirculation ) %]
  • OverDrive Account
  • [% END %] @@ -187,7 +187,7 @@ Barcode [% END %] Call no. - [% IF ( OpacRenewalAllowed && !( borrower.is_expired && borrower.category.effective_BlockExpiredPatronOpacActions ) ) %] + [% IF ( OpacRenewalAllowed && !( logged_in_user.is_expired && logged_in_user.category.effective_BlockExpiredPatronOpacActions ) ) %] Renew [% END %] [% IF ( OPACFinesTab ) %] @@ -276,7 +276,7 @@ Call no.: [% ISSUE.itemcallnumber %] - [% IF ( OpacRenewalAllowed && !( borrower.is_expired && borrower.category.effective_BlockExpiredPatronOpacActions ) ) %] + [% IF ( OpacRenewalAllowed && !( logged_in_user.is_expired && logged_in_user.category.effective_BlockExpiredPatronOpacActions ) ) %] [% IF ISSUE.renewed %]Renewed!
    [% END %] [% IF ( ISSUE.status ) %] @@ -336,12 +336,12 @@ [% END # /FOREACH ISSUES %] - [% 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 ) ) %] [% END %] - [% 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 ) ) %]
    @@ -783,9 +783,9 @@ [% IF Koha.Preference('ArticleRequests') %]
    - [% IF borrower.article_requests_current.count %] + [% IF logged_in_user.article_requests_current.count %] - + @@ -805,7 +805,7 @@ - [% FOREACH ar IN borrower.article_requests_current %] + [% FOREACH ar IN logged_in_user.article_requests_current %]
    Article requests ([% borrower.article_requests_current.count %] total)Article requests ([% logged_in_user.article_requests_current.count %] total)
    Record title
    [% ar.biblio.title %] @@ -949,7 +949,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(""); [% END %] [% END %] -- 2.39.5