From ec9ff510fd294d9145904f960b3e803467231eb0 Mon Sep 17 00:00:00 2001 From: Fridolyn SOMERS Date: Thu, 11 Jul 2013 12:39:16 +0200 Subject: [PATCH] [PASSED QA] Bug 6739 - expired patrons not blocked from opac actions - Followup 4 Some corrections : - opac-reserve.tt : opening

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 : instead of , maybe for HTML 6 :-) - opac-user.pl : adding dateformat var to template is already done by Auth.pm Signed-off-by: Kyle M Hall Signed-off-by: Katrin Fischer Passes all tests and QA script. Testing notes: - Database update * Changes to kohastructure match changes done by the updatedatabase statement. Feature is activated by default. Fixing 'yes' to be '1' in a follow up. * Ran database update succesfully. * Note: Patrons are now blocked by default in new installations 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 * Verified renewals and placing holds were never blocked. * Also verified that the warning from NotifyBorrowerDeparture still shows up correctly. * Renew and place a hold for an EXPIRED patron with a) category: use syspref (default) syspref: block (default) => OK, both actions are blocked. b) category: use syspref (default) syspref: don't block => OK, both actions possible. c) category: block syspref: don't block => OK, both actions are blocked. d) category: block syspref: block => OK, both actions are blocked. e) category: don't block sypref: block => OK, both actions possible. --- C4/Members.pm | 1 + .../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 @@

ERROR: Internal error: incomplete hold request.
[% END %] [% IF ( expired_patron ) %] -

Sorry, you cannot place holds because your library card has expired.

Please contact your librarian if you wish to renew your card

+

Sorry, you cannot place holds because your library card has expired.

Please contact your librarian if you wish to renew your card

[% 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 da91011..8e5fa41 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 ) %]
- Please note: Your account has expired. Please contact the library for more information. -
- [% ELSIF ( BORROWER_INF.warnexpired ) %] -
- Please note: You account has expired as of [% BORROWER_INF.warnexpired %]. Please contact the library if you wish to renew your account. + Please note: You account has expired as of [% BORROWER_INF.warnexpired | $KohaDates %]. Please contact the library if you wish to renew your account.
[% END %] [% IF ( RENEW_ERROR ) %]
- Please note: + Please note: 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 07b6b1b..35e5558 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.9.5