Bugzilla – Attachment 20645 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]
[SIGNED-OFF] Bug 6739 - expired patrons not blocked from opac actions - Followup 4
0005-Bug-6739-expired-patrons-not-blocked-from-opac-actio.patch (text/plain), 4.27 KB, created by
Fridolin Somers
on 2013-08-27 09:04:24 UTC
(
hide
)
Description:
[SIGNED-OFF] Bug 6739 - expired patrons not blocked from opac actions - Followup 4
Filename:
MIME Type:
Creator:
Fridolin Somers
Created:
2013-08-27 09:04:24 UTC
Size:
4.27 KB
patch
obsolete
>From 9b33dce2de346688c1923a4f0360efb7723e7829 Mon Sep 17 00:00:00 2001 >From: Fridolyn SOMERS <fridolyn.somers@biblibre.com> >Date: Thu, 11 Jul 2013 12:39:16 +0200 >Subject: [PATCH 5/5] Bug 6739 - expired patrons not blocked from opac actions > - Followup 4 > >Some corrections : >- opac-reserve.tt : opening <p> instead of closing >- opac-user.tt : warnexpired was in database format, adds the use of KohaDates template plugin >- opac-user.tt : duplicated TT test : [% IF ( BORROWER_INF.warnexpired ) %] and [% ELSIF ( BORROWER_INF.warnexpired ) %], maybe a merge error >- opac-user.tt : <string> instead of <strong>, maybe for HTML 6 :-) >- opac-user.pl : adding dateformat var to template is already done by Auth.pm > >Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> >--- > C4/Members.pm | 1 + > koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt | 2 +- > koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt | 8 ++------ > opac/opac-user.pl | 1 - > 4 files changed, 4 insertions(+), 8 deletions(-) > >diff --git a/C4/Members.pm b/C4/Members.pm >index ca5d260..055645b 100644 >--- a/C4/Members.pm >+++ b/C4/Members.pm >@@ -355,6 +355,7 @@ sub GetMemberDetails { > return; > } > my $borrower = $sth->fetchrow_hashref; >+ return unless $borrower; > my ($amount) = GetMemberAccountRecords( $borrowernumber); > $borrower->{'amountoutstanding'} = $amount; > # FIXME - patronflags calls GetMemberAccountRecords... just have patronflags return $amount >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt >index 44bde8f..af3d5b8 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt >@@ -231,7 +231,7 @@ > <div id="bad_data" class="dialog alert">ERROR: Internal error: incomplete hold request.</div> > [% END %] > [% IF ( expired_patron ) %] >- <div id="expired_patron" class="dialog alert"><p><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</p></div> >+ <div id="expired_patron" class="dialog alert"><p><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</p></div> > [% END %] > [% ELSE %] > [% IF ( none_available ) %] >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 20535dc..ca30918 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt >@@ -100,17 +100,13 @@ var MSG_CONFIRM_RESUME_HOLDS = _("Are you sure you want to resume all suspended > > [% IF ( BORROWER_INF.warnexpired ) %] > <div class="dialog alert" id="warnexpired"> >- <strong>Please note:</strong><span> Your account has expired. Please contact the library for more information.</span> >- </div> >- [% ELSIF ( BORROWER_INF.warnexpired ) %] >- <div class="dialog alert"> >- <strong>Please note:</strong><span> You account has expired as of [% BORROWER_INF.warnexpired %]. Please contact the library if you wish to renew your account.</span> >+ <strong>Please note:</strong><span> You 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"> >- <string>Please note:</string> >+ <strong>Please note:</strong> > <span> > Your account renewal failed because of the following: > [% FOREACH error IN RENEW_ERROR.split('\|') %] >diff --git a/opac/opac-user.pl b/opac/opac-user.pl >index d8028aa..3e69aef 100755 >--- a/opac/opac-user.pl >+++ b/opac/opac-user.pl >@@ -358,7 +358,6 @@ $template->param( > patronupdate => $patronupdate, > OpacRenewalAllowed => C4::Context->preference("OpacRenewalAllowed"), > userview => 1, >- dateformat => C4::Context->preference("dateformat"), > ); > > $template->param( >-- >1.7.10.4 >
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