Bugzilla – Attachment 103121 Details for
Bug 25147
AllowSelfCheckReturns is in the wrong system preference section
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 25147: (RM follow-up) Update pref references.
Bug-25147-RM-follow-up-Update-pref-references.patch (text/plain), 5.67 KB, created by
Martin Renvoize (ashimema)
on 2020-04-17 08:09:39 UTC
(
hide
)
Description:
Bug 25147: (RM follow-up) Update pref references.
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2020-04-17 08:09:39 UTC
Size:
5.67 KB
patch
obsolete
>From 081a4c75be2431e1a6fc470a5b8834fa866e2453 Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Fri, 17 Apr 2020 09:02:58 +0100 >Subject: [PATCH] Bug 25147: (RM follow-up) Update pref references. > >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >--- > 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. > </p> > >- [% IF ( returnitem && Koha.Preference('AllowSelfCheckReturns') ) %] >+ [% IF ( returnitem && Koha.Preference('SCOAllowCheckin') ) %] > <form action="/cgi-bin/koha/sco/sco-main.pl" name="errorForm" class="inline" method="post"> > <input type="hidden" name="op" value="returnbook" /> > <input type="hidden" name="patronid" value="[% patronid | html %]" /> >@@ -113,7 +113,7 @@ > <p>This item is already checked out to you.</p> > [% END %] > >- [% IF ( renew && Koha.Preference('AllowSelfCheckReturns') ) %] >+ [% IF ( renew && Koha.Preference('SCOAllowCheckin') ) %] > <form action="/cgi-bin/koha/sco/sco-main.pl" name="confirmForm" class="inline" method="post"> > <input type="hidden" name="op" value="returnbook" /> > <input type="hidden" name="patronid" value="[% patronid | html %]" /> >@@ -226,7 +226,7 @@ > <div id="newcheckout" class="sco_entry"> > <form id="scan_form" name="scan_form" method="post" action="/cgi-bin/koha/sco/sco-main.pl" onsubmit="return checkout_confirm('[% patronid | html %]');"> > <fieldset> >- <legend>Check out[% IF ( Koha.Preference('AllowSelfCheckReturns') ) %], return[% END %] or renew an item: </legend> >+ <legend>Check out[% IF ( Koha.Preference('SCOAllowCheckin') ) %], return[% END %] or renew an item: </legend> > <div class="input-append"> > <label for="barcode">Scan a new item or enter its barcode:</label> > <input id="barcode" name="barcode" size="20" type="text" class="focus" autocomplete="off" /> >@@ -331,7 +331,7 @@ > [% ELSE %] > <span>No renewals allowed</span> > [% END %] >- [% IF Koha.Preference('AllowSelfCheckReturns') %] >+ [% IF Koha.Preference('SCOAllowCheckin') %] > <input type="submit" value="Check in item" name="confirm" class="btn return" /> > <input type="hidden" name="op" value="returnbook" /> > <input type="hidden" name="confirmed" value="" /> >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.20.1
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 25147
:
103022
|
103059
|
103069
|
103116
|
103117
|
103120
| 103121