Bugzilla – Attachment 4657 Details for
Bug 6598
OPACFineNoRenewals syspreference does not stop user renewing in opac
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Proposed Patch
0001-Bug-6598-ensure-OPACFineRenewals-can-prevent-opac-re.patch (text/plain), 6.51 KB, created by
Colin Campbell
on 2011-07-18 11:52:31 UTC
(
hide
)
Description:
Proposed Patch
Filename:
MIME Type:
Creator:
Colin Campbell
Created:
2011-07-18 11:52:31 UTC
Size:
6.51 KB
patch
obsolete
>From 00a34f47bef9c5877135dc47255f88f490544806 Mon Sep 17 00:00:00 2001 >From: Colin Campbell <colin.campbell@ptfs-europe.com> >Date: Fri, 15 Jul 2011 20:58:13 +0100 >Subject: [PATCH] Bug 6598 : ensure OPACFineRenewals can prevent opac renewals >Content-Type: text/plain; charset="utf-8" > >patron_flagged was being passed at global scope to the template >but being checked as an element in other structures >Also although items could not be selected the Renew Selected >button was displayed, it too should check the flag >Amended the preference text which incorrectly suggested the >option could be turned off. (leading to the opposite to what >the user might expect) >In the script have explicitly assigned the value to a inumeric >variable rather than making an implicit conversion as it may be >that readers were missing that sleight of hand >--- > .../prog/en/modules/admin/preferences/opac.pref | 2 +- > koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt | 24 ++++++++++--------- > opac/opac-user.pl | 6 +++- > 3 files changed, 18 insertions(+), 14 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref >index f4be568..56f479e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref >@@ -320,7 +320,7 @@ OPAC: > - Only allow patrons to renew their own books on the OPAC if they have less than > - pref: OPACFineNoRenewals > class: currency >- - '[% local_currency %] in fines (leave blank to disable).' >+ - '[% local_currency %] in fines (set a large value to always allow renewal).' > - > - pref: OPACViewOthersSuggestions > choices: >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt >index e6a44a8..f8b8063 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt >@@ -110,8 +110,8 @@ $.tablesorter.addParser({ > [% IF ( BORROWER_INF.lost ) %] > <li><strong>Please note: </strong> Your library card has been marked as lost or stolen. If this is an error, please contact the library.</li> > [% END %] >- [% IF ( BORROWER_INF.renewal_blocked_fines ) %] >- <li><strong>Please note: </strong> Since you have <a href="/cgi-bin/koha/opac-account.pl">more than [% BORROWER_INF.renewal_blocked_fines %]</a> in fines, you cannot renew your books online. Please pay your fines if you wish to renew your books.</li> >+ [% IF renewal_blocked_fines %] >+ <li><strong>Please note: </strong> Since you have <a href="/cgi-bin/koha/opac-account.pl">more than [% renewal_blocked_fines %]</a> in fines, you cannot renew your books online. Please pay your fines if you wish to renew your books.</li> > [% END %] > </ul></div> > [% END %] >@@ -205,7 +205,7 @@ $.tablesorter.addParser({ > <th>Call No.</th> > <th>Due</th> > [% IF ( OpacRenewalAllowed ) %] >- [% UNLESS ( patron_flagged ) %]<th>Renew</th>[% END %] >+ [% UNLESS patron_flagged %]<th>Renew</th>[% END %] > [% END %] > [% IF ( OPACFinesTab ) %] > <th>Fines</th> >@@ -253,7 +253,7 @@ $.tablesorter.addParser({ > <td>[% ISSUE.date_due %]</td> > [% END %] > [% IF ( OpacRenewalAllowed ) %] >- [% UNLESS ( ISSUE.patron_flagged ) %] >+ [% UNLESS patron_flagged %] > <td>[% IF ( ISSUE.status ) %]<input type="checkbox" name="item" value="[% ISSUE.itemnumber %]"/><a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&item=[% ISSUE.itemnumber %]&borrowernumber=[% ISSUE.borrowernumber %]">Renew</a> <span class="renewals">([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)</span> > [% ELSE %] > Not renewable[% IF ( ISSUE.too_many ) %] <span class="renewals">([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)</span>[% ELSE %][% IF ( ISSUE.on_reserve ) %] <span class="renewals">(On hold)</span>[% END %][% END %] >@@ -269,10 +269,12 @@ $.tablesorter.addParser({ > </tr> > [% END %]</tbody> > </table> >- >- [% IF ( OpacRenewalAllowed ) %] >- <input type="submit" value="Renew Selected" /> >- [% END %] >+ >+ [% IF OpacRenewalAllowed %] >+ [% UNLESS patron_flagged %] >+ <input type="submit" value="Renew Selected" /> >+ [% END %] >+ [% END %] > </form> > [% IF ( OpacRenewalAllowed ) %] > >@@ -282,7 +284,7 @@ $.tablesorter.addParser({ > [% FOREACH ISSUE IN ISSUES %] > <input type="hidden" name="item" value="[% ISSUE.itemnumber %]" /> > [% END %] >- [% UNLESS ( patron_flagged ) %]<input type="submit" value="Renew All" />[% END %] >+ [% UNLESS patron_flagged %]<input type="submit" value="Renew All" />[% END %] > </form> > [% END %] > [% ELSE %] >@@ -304,7 +306,7 @@ $.tablesorter.addParser({ > <th>Call No.</th> > <th>Due</th> > [% IF ( OpacRenewalAllowed ) %] >- [% UNLESS ( patron_flagged ) %]<th>Renew</th>[% END %][% END %] >+ [% UNLESS patron_flagged %]<th>Renew</th>[% END %][% END %] > [% IF ( OPACFinesTab ) %] > <th>Fines</th> > [% END %] >@@ -336,7 +338,7 @@ $.tablesorter.addParser({ > <td>[% OVERDUE.itemcallnumber %]</td> > <td>[% OVERDUE.date_due %]</td> > [% IF ( OpacRenewalAllowed ) %] >- [% UNLESS ( OVERDUE.patron_flagged ) %] >+ [% UNLESS patron_flagged %] > <td> > [% IF ( OVERDUE.debarred ) %]Account Frozen > [% ELSIF ( OVERDUE.status ) %] >diff --git a/opac/opac-user.pl b/opac/opac-user.pl >index 2c31ce7..97574b1 100755 >--- a/opac/opac-user.pl >+++ b/opac/opac-user.pl >@@ -79,11 +79,13 @@ if ( $borr->{'amountoutstanding'} > 5 ) { > if ( 5 >= $borr->{'amountoutstanding'} && $borr->{'amountoutstanding'} > 0 ) { > $borr->{'amountoverzero'} = 1; > } >+my $no_renewal_amt = C4::Context->preference( 'OPACFineNoRenewals' ); >+$no_renewal_amt ||= 0; > >-if ( $borr->{'amountoutstanding'} > C4::Context->preference( 'OPACFineNoRenewals' ) ) { >+if ( $borr->{amountoutstanding} > $no_renewal_amt ) { > $borr->{'flagged'} = 1; > $template->param( >- renewal_blocked_fines => sprintf( "%.02f", C4::Context->preference( 'OPACFineNoRenewals' ) ), >+ renewal_blocked_fines => sprintf( '%.02f', $no_renewal_amt ), > ); > } > >-- >1.7.6 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 6598
:
4657
|
5842
|
6179
|
7204
|
7619
|
7620