From 081a4c75be2431e1a6fc470a5b8834fa866e2453 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Fri, 17 Apr 2020 09:02:58 +0100 Subject: [PATCH] Bug 25147: (RM follow-up) Update pref references. Signed-off-by: Martin Renvoize --- C4/UsageStats.pm | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 8 ++++---- opac/sco/sco-main.pl | 6 +++--- t/db_dependent/UsageStats.t | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/C4/UsageStats.pm b/C4/UsageStats.pm index d608eb9ea9..52fb4ce823 100644 --- a/C4/UsageStats.pm +++ b/C4/UsageStats.pm @@ -198,7 +198,7 @@ sub BuildReport { UpdateTotalIssuesOnCirc UseTablesortForCirc WaitingNotifyAtCheckin - AllowSelfCheckReturns + SCOAllowCheckin AutoSelfCheckAllowed FRBRizeEditions OPACFRBRizeEditions diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt index e475470488..1b984e6693 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt @@ -86,7 +86,7 @@ Please see a member of the library staff.

- [% IF ( returnitem && Koha.Preference('AllowSelfCheckReturns') ) %] + [% IF ( returnitem && Koha.Preference('SCOAllowCheckin') ) %]
@@ -113,7 +113,7 @@

This item is already checked out to you.

[% END %] - [% IF ( renew && Koha.Preference('AllowSelfCheckReturns') ) %] + [% IF ( renew && Koha.Preference('SCOAllowCheckin') ) %] @@ -226,7 +226,7 @@
- Check out[% IF ( Koha.Preference('AllowSelfCheckReturns') ) %], return[% END %] or renew an item: + Check out[% IF ( Koha.Preference('SCOAllowCheckin') ) %], return[% END %] or renew an item:
@@ -331,7 +331,7 @@ [% ELSE %] No renewals allowed [% END %] - [% IF Koha.Preference('AllowSelfCheckReturns') %] + [% IF Koha.Preference('SCOAllowCheckin') %] diff --git a/opac/sco/sco-main.pl b/opac/sco/sco-main.pl index 69363eac0a..83a37aca46 100755 --- a/opac/sco/sco-main.pl +++ b/opac/sco/sco-main.pl @@ -93,10 +93,10 @@ if (C4::Context->preference('SelfCheckTimeout')) { } $template->param( SelfCheckTimeout => $selfchecktimeout ); -# Checks policy laid out by AllowSelfCheckReturns, defaults to 'on' if preference is undefined +# Checks policy laid out by SCOAllowCheckin, defaults to 'on' if preference is undefined my $allowselfcheckreturns = 1; -if (defined C4::Context->preference('AllowSelfCheckReturns')) { - $allowselfcheckreturns = C4::Context->preference('AllowSelfCheckReturns'); +if (defined C4::Context->preference('SCOAllowCheckin')) { + $allowselfcheckreturns = C4::Context->preference('SCOAllowCheckin'); } my $issuerid = $loggedinuser; diff --git a/t/db_dependent/UsageStats.t b/t/db_dependent/UsageStats.t index 1aabf76138..f4e9949a69 100644 --- a/t/db_dependent/UsageStats.t +++ b/t/db_dependent/UsageStats.t @@ -459,7 +459,7 @@ sub mocking_systempreferences_to_a_set_value { UpdateTotalIssuesOnCirc UseTablesortForCirc WaitingNotifyAtCheckin - AllowSelfCheckReturns + SCOAllowCheckin AutoSelfCheckAllowed FRBRizeEditions OPACFRBRizeEditions -- 2.39.5