Bugzilla – Attachment 26843 Details for
Bug 6739
expired patrons not blocked from opac actions
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[PASSED QA] Bug 6739: Template changes for the bootstrap theme
PASSED-QA-Bug-6739-Template-changes-for-the-bootst.patch (text/plain), 9.26 KB, created by
Katrin Fischer
on 2014-04-06 20:11:09 UTC
(
hide
)
Description:
[PASSED QA] Bug 6739: Template changes for the bootstrap theme
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2014-04-06 20:11:09 UTC
Size:
9.26 KB
patch
obsolete
>From 05647e9ce9012f2d6fba00c7d56c2a524a4016c9 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@biblibre.com> >Date: Wed, 15 Jan 2014 11:53:56 +0100 >Subject: [PATCH] [PASSED QA] Bug 6739: Template changes for the bootstrap > theme > >Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> >Passes QA script, t, xt and t/db_dependent/Members*. > >Testing notes: > - Database update > * Changes to kohastructure match changes done by the updatedatabase > statement. Feature is activated by default! > * Ran database update succesfully. > * Note: Expired patrons are now blocked by default in new > AND in updated installations. > - System preference > * Verified system preference shows up correctly. > - Category configuration > * Add new patron category > * Edit existing patron category > * Delete patron category > * Check patron category summary table. > => Verified all actions work as expected. > => Verified chosen value for BlockExpiredPatronOpacActions > is always displayed and saved correctly. > * Note: The new value is missing from the summary table. > * Note: The new value is also not shown when deleting a patron > category. > - Check functionality > * Renew and place a hold for an NOT EXPIRED patron with > a) category: use syspref (default) > syspref: block (default) > b) category: use syspref (default) > syspref: don't block > c) category: block > syspref: don't block > d) category: block > syspref: block > e) category: don't block > sypref: block > f) category: don't block > syspref: don't block > Holds and renewals were always possible. > * Also verified that the warning from NotifyBorrowerDeparture > still shows up correctly. > * Verified holds and renewals are still blocked, when the > user has a restriction with a date in the future. > * Renew and place a hold for an EXPIRED patron with > a) category: use syspref (default) > syspref: block (default) > Holds and renewals blocked. > b) category: use syspref (default) > syspref: don't block > Holds an renewals possible. > c) category: block > syspref: don't block > Holds and renewals blocked. > d) category: block > syspref: block > Holds and renewals blocked. > e) category: don't block > sypref: block > Holds and renewals possible. > f) category: don't block > syspref: don't block > Holds and renewals possible. >--- > .../opac-tmpl/bootstrap/en/modules/opac-reserve.tt | 4 +++ > .../opac-tmpl/bootstrap/en/modules/opac-user.tt | 35 +++++++++++++++++----- > 2 files changed, 32 insertions(+), 7 deletions(-) > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt >index d42323c..ccccfdb 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt >@@ -76,6 +76,10 @@ > <div id="bad_data" class="alert">ERROR: Internal error: incomplete hold request.</div> > [% END %] > >+ [% IF ( expired_patron ) %] >+ <div id="expired_patron" class="alert"><strong>Sorry</strong>, you cannot place holds because your library card has expired.</p><p>Please contact your librarian if you wish to renew your card.</div> >+ [% END %] >+ > [% ELSE %] > > [% IF ( none_available ) %] >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 b4a337f..87a6795 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >@@ -57,7 +57,25 @@ > > [% IF ( BORROWER_INF.warnexpired ) %] > <div class="alert" id="warnexpired"> >- <strong>Please note:</strong><span> Your card has expired. Please contact the library for more information.</span> >+ <strong>Please note: </strong><span>Your account has expired as of [% BORROWER_INF.warnexpired | $KohaDates %]. Please contact the library if you wish to renew your account.</span> >+ </div> >+ [% END %] >+ >+ [% IF ( RENEW_ERROR ) %] >+ <div class="dialog alert"> >+ <strong>Please note:</strong> >+ <span> >+ Your account renewal failed because of the following: >+ [% FOREACH error IN RENEW_ERROR.split('\|') %] >+ [% IF error == 'card_expired' %] >+ Your account has expired. Please contact the library for more information. >+ [% ELSIF error == 'too_many' %] >+ You have renewed this item the maximum number of times allowed. >+ [% ELSIF error == 'on_reserve' %] >+ This item is on hold for another patron. >+ [% END %] >+ [% END %] >+ </span> > </div> > [% END %] > >@@ -112,7 +130,7 @@ > <th>Barcode</th> > [% END %] > <th>Call No.</th> >- [% IF ( OpacRenewalAllowed ) %] >+ [% IF ( OpacRenewalAllowed && !( borrower.is_expired && borrower.BlockExpiredPatronOpacActions ) ) %] > <th class="nosort">Renew</th> > [% END %] > [% IF ( OPACFinesTab ) %] >@@ -198,7 +216,7 @@ > <span class="tdlabel">Call number:</span> > [% ISSUE.itemcallnumber %] > </td> >- [% IF ( OpacRenewalAllowed ) %] >+ [% IF ( OpacRenewalAllowed && !( borrower.is_expired && borrower.BlockExpiredPatronOpacActions ) ) %] > <td class="renew"> > [% IF ( ISSUE.status ) %] > [% IF ( canrenew ) %] >@@ -234,12 +252,12 @@ > [% END # /FOREACH ISSUES %] > </tbody> > </table> >- [% IF ( canrenew && !userdebarred && OpacRenewalAllowed ) %] >+ [% IF ( canrenew && !userdebarred && OpacRenewalAllowed && !( borrower.is_expired && borrower.BlockExpiredPatronOpacActions ) ) %] > <input type="submit" class="btn" value="Renew selected" /> > [% END %] > </form> > >- [% IF ( canrenew && !userdebarred && OpacRenewalAllowed ) %] >+ [% IF ( canrenew && !userdebarred && OpacRenewalAllowed && !( borrower.is_expired && borrower.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 %]" /> >@@ -656,7 +674,7 @@ > var MSG_CONFIRM_SUSPEND_HOLDS = _("Are you sure you want to suspend all holds?"); > var MSG_CONFIRM_RESUME_HOLDS = _("Are you sure you want to resume all suspended holds?"); > >- $(function() { >+ $(document).ready(function(){ > $('#opac-user-views').tabs(); > $(".js-show").show(); > $(".js-hide").hide(); >@@ -697,8 +715,11 @@ > e.preventDefault(); > $("#renewall").submit(); > }); >- $("#checkoutst caption").append("<div id=\"renewcontrols\"><a id=\"renewselected_link\" href=\"#\">"+_("Renew selected")+"</a> <a id=\"renewall_link\" href=\"#\">"+_("Renew all")+"</a></div>"); >+ [% IF ( canrenew && !userdebarred && OpacRenewalAllowed && !( borrower.is_expired && borrower.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 %] >+ > $( ".suspend-until" ).datepicker({ minDate: 1 }); // Require that "until date" be in the future > }); > //]]> >-- >1.8.3.2
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 6739
:
7814
|
9108
|
16061
|
16063
|
16064
|
16065
|
16069
|
16071
|
16072
|
17356
|
17357
|
17463
|
17464
|
17466
|
17517
|
17518
|
17907
|
17908
|
17909
|
18041
|
18042
|
18043
|
19553
|
19554
|
19555
|
19558
|
19559
|
19560
|
19678
|
19679
|
19993
|
19994
|
19995
|
19996
|
19997
|
20641
|
20642
|
20643
|
20644
|
20645
|
21312
|
21313
|
21314
|
21315
|
21316
|
21317
|
24385
|
24386
|
24387
|
24388
|
24389
|
24390
|
24391
|
24392
|
25158
|
25159
|
25160
|
25161
|
25162
|
25163
|
25164
|
25165
|
25231
|
25232
|
25233
|
26546
|
26547
|
26548
|
26549
|
26550
|
26551
|
26552
|
26553
|
26836
|
26837
|
26838
|
26839
|
26840
|
26841
|
26842
| 26843