Bugzilla – Attachment 77378 Details for
Bug 21137
Replace BORROWER_INFO and USER_INFO with logged_in_user
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 21137: Replace BORROWER_INFO with logged_in_user
Bug-21137-Replace-BORROWERINFO-with-loggedinuser.patch (text/plain), 25.16 KB, created by
Owen Leonard
on 2018-08-01 16:14:41 UTC
(
hide
)
Description:
Bug 21137: Replace BORROWER_INFO with logged_in_user
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2018-08-01 16:14:41 UTC
Size:
25.16 KB
patch
obsolete
>From d8953d00da3840a0b00ffcce683d735396cc2609 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Wed, 1 Aug 2018 10:03:42 -0300 >Subject: [PATCH] Bug 21137: Replace BORROWER_INFO with logged_in_user > >it also removes 'category_type' and 'description' from a couple of >opac scripts, they are not needed. > >Signed-off-by: Owen Leonard <oleonard@myacpl.org> >--- > .../bootstrap/en/includes/patron-title.inc | 13 ++++--- > .../bootstrap/en/modules/opac-account-pay-error.tt | 2 +- > .../opac-tmpl/bootstrap/en/modules/opac-account.tt | 2 +- > .../bootstrap/en/modules/opac-illrequests.tt | 2 +- > .../bootstrap/en/modules/opac-issue-note.tt | 2 +- > .../modules/opac-memberentry-update-submitted.tt | 2 +- > .../bootstrap/en/modules/opac-memberentry.tt | 2 +- > .../bootstrap/en/modules/opac-messaging.tt | 2 +- > .../opac-tmpl/bootstrap/en/modules/opac-passwd.tt | 2 +- > .../opac-tmpl/bootstrap/en/modules/opac-privacy.tt | 2 +- > .../bootstrap/en/modules/opac-readingrecord.tt | 2 +- > .../bootstrap/en/modules/opac-routing-lists.tt | 2 +- > .../opac-tmpl/bootstrap/en/modules/opac-user.tt | 44 +++++++++++----------- > opac/opac-account.pl | 6 --- > opac/opac-messaging.pl | 2 +- > opac/opac-routing-lists.pl | 5 --- > opac/opac-user.pl | 3 +- > 17 files changed, 43 insertions(+), 52 deletions(-) > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/patron-title.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/patron-title.inc >index 265125d..81a4e72 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/patron-title.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/patron-title.inc >@@ -1,5 +1,8 @@ >-[% IF category_type == 'I' %] >- [% surname %] [% IF othernames %] ([% othernames %]) [% END %] >-[% ELSE %] >- [% firstname %] [% surname %] >-[% END %] >+[%- IF patron.category.category_type == 'I' -%] >+ [% patron.surname %][% IF patron.othernames %] ([% patron.othernames %]) [%- END -%] >+[%- ELSE -%] >+ [%- IF patron.title -%] >+ <span class="patron-title">[% patron.title %]</span> >+ [%- END -%] >+ [% patron.firstname %] [% patron.surname %] >+[%- END -%] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account-pay-error.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account-pay-error.tt >index d4fb5b5..712f7bc 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account-pay-error.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account-pay-error.tt >@@ -9,7 +9,7 @@ > <div class="main"> > <ul class="breadcrumb"> > <li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">›</span></li> >- <li><a href="/cgi-bin/koha/opac-user.pl">[% borrower.firstname %] [% borrower.surname %]</a> <span class="divider">›</span></li> >+ <li><a href="/cgi-bin/koha/opac-user.pl">[% INCLUDE 'patron-title.inc' patron = logged_in_user %]</a> <span class="divider">›</span></li> > <li><a href="#">Your payment</a></li> > </ul> > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt >index 2ea8607..f381668 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt >@@ -19,7 +19,7 @@ > <div class="main"> > <ul class="breadcrumb"> > <li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">›</span></li> >- <li>[% IF BORROWER_INFO %]<a href="/cgi-bin/koha/opac-user.pl">[% BORROWER_INFO.firstname %] [% BORROWER_INFO.surname %]</a>[% END %] <span class="divider">›</span></li> >+ <li>[% IF logged_in_user %]<a href="/cgi-bin/koha/opac-user.pl">[% INCLUDE 'patron-title.inc' patron = logged_in_user %]</a>[% END %] <span class="divider">›</span></li> > <li><a href="#">Your fines and charges</a></li> > </ul> > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt >index fadd6fb..ce61db7 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt >@@ -17,7 +17,7 @@ > <ul class="breadcrumb noprint"> > <li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">›</span></li> > [% IF ( logged_in_user ) %] >- <li><a href="/cgi-bin/koha/opac-user.pl">[% INCLUDE patron-title.inc patron = logged_in_user %]</a> <span class="divider">›</span></li> >+ <li><a href="/cgi-bin/koha/opac-user.pl">[% INCLUDE 'patron-title.inc' patron = logged_in_user %]</a> <span class="divider">›</span></li> > [% END %] > > [% IF method != 'list' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-issue-note.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-issue-note.tt >index 03a6a7b..f8ecf55 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-issue-note.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-issue-note.tt >@@ -12,7 +12,7 @@ > <div class="main"> > <ul class="breadcrumb"> > <li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">›</span></li> >- <li><a href="/cgi-bin/koha/opac-user.pl">[% firstname %] [% surname %]</a><span class="divider">›</span></li> >+ <li><a href="/cgi-bin/koha/opac-user.pl">[% INCLUDE 'patron-title.inc' patron = logged_in_user %]</a><span class="divider">›</span></li> > <li><a href="#">Editing issue note for [% ISSUE.title %] - [% ISSUE.author %]</a></li> > </ul> > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry-update-submitted.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry-update-submitted.tt >index 30714e0..a92a01e 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry-update-submitted.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry-update-submitted.tt >@@ -10,7 +10,7 @@ > <div class="main"> > <ul class="breadcrumb"> > <li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">›</span></li> >- <li><a href="/cgi-bin/koha/opac-user.pl">[% borrower.firstname %] [% borrower.surname %]</a> <span class="divider">›</span></li> >+ <li><a href="/cgi-bin/koha/opac-user.pl">[% INCLUDE 'patron-title.inc' patron = logged_in_user %]</a> <span class="divider">›</span></li> > <li><a href="#">Updates to your record</a></li> > </ul> > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt >index 7b39196..f72274a 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt >@@ -24,7 +24,7 @@ > <ul class="breadcrumb"> > <li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">›</span></li> > [% IF action == 'edit' %] >- <li><a href="/cgi-bin/koha/opac-user.pl">[% borrower.firstname %] [% borrower.surname %]</a> <span class="divider">›</span></li> >+ <li><a href="/cgi-bin/koha/opac-user.pl">[% INCLUDE 'patron-title.inc' patron = logged_in_user %]</a> <span class="divider">›</span></li> > <li><a href="#">Your personal details</a></li> > [% ELSE %] > <li><a href="#">Register a new account</a></li> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt >index 6adfc97..c12b0f8 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt >@@ -10,7 +10,7 @@ > <div class="main"> > <ul class="breadcrumb"> > <li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">›</span></li> >- <li><a href="/cgi-bin/koha/opac-user.pl">[% BORROWER_INFO.firstname %] [% BORROWER_INFO.surname %]</a> <span class="divider">›</span></li> >+ <li><a href="/cgi-bin/koha/opac-user.pl">[% INCLUDE 'patron-title.inc' patron = logged_in_user %]</a> <span class="divider">›</span></li> > <li><a href="#">Your messaging settings</a></li> > </ul> > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt >index f34b919..07ba100 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt >@@ -11,7 +11,7 @@ > <div class="main"> > <ul class="breadcrumb"> > <li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">›</span></li> >- <li><a href="/cgi-bin/koha/opac-user.pl">[% firstname %] [% surname %]</a> <span class="divider">›</span></li> >+ <li><a href="/cgi-bin/koha/opac-user.pl">[% INCLUDE 'patron-title.inc' patron = logged_in_user %]</a> <span class="divider">›</span></li> > <li><a href="#">Change your password</a></li> > </ul> > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt >index 143f4e0..b776289 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt >@@ -10,7 +10,7 @@ > <div class="main"> > <ul class="breadcrumb"> > <li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">›</span></li> >- <li><a href="/cgi-bin/koha/opac-user.pl">[% firstname %] [% surname %]</a> <span class="divider">›</span></li> >+ <li><a href="/cgi-bin/koha/opac-user.pl">[% INCLUDE 'patron-title.inc' patron = logged_in_user %]</a> <span class="divider">›</span></li> > <li><a href="#">Your privacy management</a></li> > </ul> > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt >index 8d4829a..367cc14 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt >@@ -19,7 +19,7 @@ > <div class="main"> > <ul class="breadcrumb"> > <li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">›</span></li> >- <li><a href="/cgi-bin/koha/opac-user.pl">[% firstname %] [% surname %]</a> <span class="divider">›</span></li> >+ <li><a href="/cgi-bin/koha/opac-user.pl">[% INCLUDE 'patron-title.inc' patron = logged_in_user %]</a> <span class="divider">›</span></li> > <li><a href="#">Your checkout history</a></li> > </ul> > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt >index 189b307..c2b42ee 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt >@@ -15,7 +15,7 @@ > <div class="main"> > <ul class="breadcrumb"> > <li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">›</span></li> >- <li><a href="/cgi-bin/koha/opac-routing-lists.pl">[% INCLUDE 'patron-title.inc' category_type = BORROWER_INFO.category_type firstname = BORROWER_INFO.firstname surname = BORROWER_INFO.surname othernames = BORROWER_INFO.othernames cardnumber = BORROWER_INFO.cardnumber %]</a> <span class="divider">›</span></li> >+ <li><a href="/cgi-bin/koha/opac-routing-lists.pl">[% INCLUDE 'patron-title.inc' patron = logged_in_user %]</a> <span class="divider">›</span></li> > <li><a href="#">Your routing lists</a></li> > </ul> > >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 973baa6..f9239cb 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >@@ -25,7 +25,7 @@ > <div class="main"> > <ul class="breadcrumb"> > <li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">›</span></li> >- <li><a href="/cgi-bin/koha/opac-user.pl">[% INCLUDE 'patron-title.inc' category_type = BORROWER_INFO.category_type firstname = BORROWER_INFO.firstname surname = BORROWER_INFO.surname othernames = BORROWER_INFO.othernames cardnumber = BORROWER_INFO.cardnumber %]</a> <span class="divider">›</span></li> >+ <li><a href="/cgi-bin/koha/opac-user.pl">[% INCLUDE 'patron-title.inc' patron = logged_in_user %]</a> <span class="divider">›</span></li> > <li><a href="#">Your summary</a></li> > </ul> > >@@ -41,10 +41,10 @@ > > [% INCLUDE 'opac-note.inc' %] > >- <h2>Hello, [% INCLUDE 'patron-title.inc' category_type = BORROWER_INFO.category_type firstname = BORROWER_INFO.firstname surname = BORROWER_INFO.surname othernames = BORROWER_INFO.othernames cardnumber = BORROWER_INFO.cardnumber %] >+ <h2>Hello, [% INCLUDE 'patron-title.inc' patron = logged_in_user %] > </h2> > >- <p><a href="/cgi-bin/koha/opac-main.pl?logout.x=1">Click here if you're not [% BORROWER_INFO.title %] [% INCLUDE 'patron-title.inc' category_type = BORROWER_INFO.category_type firstname = BORROWER_INFO.firstname surname = BORROWER_INFO.surname othernames = BORROWER_INFO.othernames cardnumber = BORROWER_INFO.cardnumber %]</a></p> >+ <p><a href="/cgi-bin/koha/opac-main.pl?logout.x=1">Click here if you're not [% INCLUDE 'patron-title.inc' patron = logged_in_user %]</a></p> > > [% IF ( patronupdate ) %]<div class="alert alert-info"><h3>Thank you!</h3><p>Your corrections have been submitted to the library, and a staff member will update your record as soon as possible.</p></div>[% END %] > >@@ -55,16 +55,16 @@ > </div> > [% END %] > >- [% IF ( BORROWER_INFO.warndeparture ) %] >+ [% IF ( borrower.warndeparture ) %] > <div class="alert" id="warndeparture"> >- <strong>Please note:</strong><span> Your card will expire on <span id="warndeparture_date">[% BORROWER_INFO.warndeparture | $KohaDates %]</span>. Please contact the library for more information.</span> >- [% IF ( BORROWER_INFO.returnbeforeexpiry ) %]<span id="warndeparture_returnbeforeexpiry"> Also note that you must return all checked out items before your card expires.</span>[% END %] >+ <strong>Please note:</strong><span> Your card will expire on <span id="warndeparture_date">[% borrower.warndeparture | $KohaDates %]</span>. Please contact the library for more information.</span> >+ [% IF ( borrower.returnbeforeexpiry ) %]<span id="warndeparture_returnbeforeexpiry"> Also note that you must return all checked out items before your card expires.</span>[% END %] > </div> > [% END %] > >- [% IF ( BORROWER_INFO.warnexpired ) %] >+ [% IF ( borrower.warnexpired ) %] > <div class="alert" id="warnexpired"> >- <strong>Please note: </strong><span>Your account has expired as of [% BORROWER_INFO.warnexpired | $KohaDates %]. Please contact the library if you wish to renew your account.</span> >+ <strong>Please note: </strong><span>Your account has expired as of [% borrower.warnexpired | $KohaDates %]. Please contact the library if you wish to renew your account.</span> > </div> > [% END %] > >@@ -98,33 +98,33 @@ > </li> > [% ELSE %] > <li id="userdebarred"><strong>Please note:</strong> Your account has been frozen. >- [% IF ( BORROWER_INFO.debarredcomment ) %] >+ [% IF ( borrower.debarredcomment ) %] > Comment: > <span id="userdebarred_comment"> > <strong> >- [% IF BORROWER_INFO.debarredcomment.search('OVERDUES_PROCESS') %] >- Restriction added by overdues process [% BORROWER_INFO.debarredcomment.remove('OVERDUES_PROCESS ') | html_line_break %] >+ [% IF borrower.debarredcomment.search('OVERDUES_PROCESS') %] >+ Restriction added by overdues process [% borrower.debarredcomment.remove('OVERDUES_PROCESS ') | html_line_break %] > [% ELSE %] >- [% BORROWER_INFO.debarredcomment | html_line_break %] >+ [% borrower.debarredcomment | html_line_break %] > [% END %] > </strong> > </span> > [% END %] >- [% IF ( BORROWER_INFO.userdebarreddate && debarred_date != '9999-12-31' ) %] >+ [% IF ( borrower.userdebarreddate && debarred_date != '9999-12-31' ) %] > End date: >- <span id="userdebarred_date">[% BORROWER_INFO.userdebarreddate | $KohaDates %]</span> >+ <span id="userdebarred_date">[% borrower.userdebarreddate | $KohaDates %]</span> > [% END %] > > <em>Usually the reason for freezing an account is old overdues or damage fees. If your account shows to be clear, please contact the library.</em> <a href="/cgi-bin/koha/opac-account.pl">Go to your account page</a></li> > [% END %] > [% END %] >- [% IF ( BORROWER_INFO.gonenoaddress ) %] >+ [% IF ( borrower.gonenoaddress ) %] > <li id="gonenoaddress"><strong>Please note:</strong> According to our records, we don't have up-to-date contact information. Please contact the library. > <a href="/cgi-bin/koha/opac-memberentry.pl">[% IF ( Koha.Preference('OPACPatronDetails') ) %]Update your contact information[% ELSE %]Go to your contact information[% END %]</a> > [% IF ( Koha.Preference('OPACPatronDetails') ) %]<em>(Please note: there may be a delay in restoring your account if you submit online.)</em>[% END %] > </li> > [% END %] >- [% IF ( BORROWER_INFO.lost ) %] >+ [% IF ( borrower.lost ) %] > <li id="lost"><strong>Please note: </strong> Your library card has been marked as lost or stolen. <em>If this is an error, please contact the library.</em></li> > [% END %] > [% IF ( renewal_blocked_fines.defined ) && ( OpacRenewalAllowed ) %] >@@ -145,9 +145,9 @@ > [% IF relatives %]<li><a href="#opac-user-relative-issues">Relatives' checkouts</a></li>[% END %] > [% IF ( overdues_count ) %]<li><a href="#opac-user-overdues">Overdue ([% overdues_count %])</a></li>[% END %] > [% IF ( OPACFinesTab ) %] >- [% IF ( BORROWER_INFO.amountoverfive ) %]<li><a href="#opac-user-fines">Fines ([% amountoutstanding | $Price %])</a></li>[% END %] >- [% IF ( BORROWER_INFO.amountoverzero ) %]<li><a href="#opac-user-fines">Fines ([% amountoutstanding | $Price %])</a></li>[% END %] >- [% IF ( BORROWER_INFO.amountlessthanzero ) %]<li><a href="#opac-user-fines">Credits ([% amountoutstanding | $Price %])</a></li>[% END %] >+ [% IF ( borrower.amountoverfive ) %]<li><a href="#opac-user-fines">Fines ([% amountoutstanding | $Price %])</a></li>[% END %] >+ [% IF ( borrower.amountoverzero ) %]<li><a href="#opac-user-fines">Fines ([% amountoutstanding | $Price %])</a></li>[% END %] >+ [% IF ( borrower.amountlessthanzero ) %]<li><a href="#opac-user-fines">Credits ([% amountoutstanding | $Price %])</a></li>[% END %] > [% END %] > > [% IF borrower_club_enrollments.count || borrower_enrollable_clubs.count %] >@@ -371,7 +371,7 @@ > > [% IF ( OPACFinesTab ) %] > <!-- FINES BOX --> >- [% IF BORROWER_INFO.amountoverfive %] >+ [% IF borrower.amountoverfive %] > <div id="opac-user-fines"> <h3>Fines and charges</h3> > <table class="table table-bordered table-striped"> > <thead><tr><th colspan="2">Amount</th></tr></thead> >@@ -385,7 +385,7 @@ > </div> > [% END %] > >- [% IF BORROWER_INFO.amountoverzero %] >+ [% IF borrower.amountoverzero %] > <div id="opac-user-fines"> <h3>Fines and charges</h3> > <table class="table table-bordered table-striped"> > <thead><tr><th colspan="2">Amount</th></tr></thead> >@@ -399,7 +399,7 @@ > </div> > [% END %] > >- [% IF BORROWER_INFO.amountlessthanzero %] >+ [% IF borrower.amountlessthanzero %] > <div id="opac-user-fines"> <h3>Credits</h3> > <table class="table table-bordered table-striped"> > <thead><tr><th colspan="2">Amount</th></tr></thead> >diff --git a/opac/opac-account.pl b/opac/opac-account.pl >index 9611554..2cbbf4e 100755 >--- a/opac/opac-account.pl >+++ b/opac/opac-account.pl >@@ -40,12 +40,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user( > ); > > my $patron = Koha::Patrons->find( $borrowernumber ); >-my $category = $patron->category; >-my $borrower= $patron->unblessed; >-$borrower->{description} = $category->description; >-$borrower->{category_type} = $category->category_type; >-$template->param( BORROWER_INFO => $borrower ); >- > my $total = $patron->account->balance; > my $accts = Koha::Account::Lines->search( > { borrowernumber => $patron->borrowernumber }, >diff --git a/opac/opac-messaging.pl b/opac/opac-messaging.pl >index d2c4033..8189493 100755 >--- a/opac/opac-messaging.pl >+++ b/opac/opac-messaging.pl >@@ -71,7 +71,7 @@ if ( defined $query->param('modify') && $query->param('modify') eq 'yes' ) { > > C4::Form::MessagingPreferences::set_form_values({ borrowernumber => $patron->borrowernumber }, $template); > >-$template->param( BORROWER_INFO => $patron->unblessed, >+$template->param( > messagingview => 1, > SMSnumber => $patron->smsalertnumber, # FIXME This is already sent 2 lines above > SMSSendDriver => C4::Context->preference("SMSSendDriver"), >diff --git a/opac/opac-routing-lists.pl b/opac/opac-routing-lists.pl >index 67bb5fa..8c806e9 100755 >--- a/opac/opac-routing-lists.pl >+++ b/opac/opac-routing-lists.pl >@@ -42,11 +42,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user( > ); > > my $patron = Koha::Patrons->find( $borrowernumber ); >-my $category = $patron->category; >-my $borrower= $patron->unblessed; >-$borrower->{description} = $category->description; >-$borrower->{category_type} = $category->category_type; >-$template->param( BORROWER_INFO => $borrower ); > > $template->param( > routinglistsview => 1, >diff --git a/opac/opac-user.pl b/opac/opac-user.pl >index 78bd30b..94b0614 100755 >--- a/opac/opac-user.pl >+++ b/opac/opac-user.pl >@@ -163,7 +163,7 @@ if ( $borr->{'dateexpiry'} && C4::Context->preference('NotifyBorrowerDeparture') > # pass on any renew errors to the template for displaying > my $renew_error = $query->param('renew_error'); > >-$template->param( BORROWER_INFO => $borr, >+$template->param( > amountoutstanding => $amountoutstanding, > borrowernumber => $borrowernumber, > patron_flagged => $borr->{flagged}, >@@ -350,7 +350,6 @@ if ( C4::Context->preference('AllowPatronToSetCheckoutsVisibilityForGuarantor' > } > > $template->param( >- borrower => scalar Koha::Patrons->find($borrowernumber), > patron_messages => $patron_messages, > opacnote => $borr->{opacnote}, > patronupdate => $patronupdate, >-- >2.1.4
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=77378">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
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