From 9f34058cf5d17ce7962bd192682a865cc1588cda Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Sun, 22 Sep 2013 16:20:19 +0200 Subject: [PATCH] Bug 6739 - expired patrons not blocked from opac actions - Followup 5 - Fixes a typo in one of the OPAC messages: "you account" - Fixes the updatedatabase script to use 1 instead of yes for the system preference default matching the sysprefs.sql file. - Fixes capitalization "Don't Block" in system preference description. - Adding . to the end of the warning, when renewals are blocked. --- installer/data/mysql/updatedatabase.pl | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref | 2 +- koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt | 2 +- koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 5a1cef5..d17b947 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -7146,7 +7146,7 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ( 'BlockExpiredPatronOpacActions', - 'yes', + '1', 'Set whether an expired patron can perform opac actions such as placing holds or renew books, can be overridden on a per patron-type basis', NULL, 'YesNo' 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 0a6ba28..b9cf295 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 @@ -514,7 +514,7 @@ OPAC: - pref: BlockExpiredPatronOpacActions choices: yes: "Block" - no: "Don't Block" + no: "Don't block" - expired patrons from opac actions such as placing a hold or renew, the setting for a patron category takes priority over this Privacy: 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 16a67a6..874d34d 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt @@ -270,7 +270,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 29d9b9c..b16c779 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt @@ -100,7 +100,7 @@ var MSG_CONFIRM_RESUME_HOLDS = _("Are you sure you want to resume all suspended [% IF ( BORROWER_INF.warnexpired ) %]
- Please note: You account has expired as of [% BORROWER_INF.warnexpired | $KohaDates %]. Please contact the library if you wish to renew your account. + Please note: Your account has expired as of [% BORROWER_INF.warnexpired | $KohaDates %]. Please contact the library if you wish to renew your account.
[% END %] -- 1.7.10.4