Browse Source

Bug 25147: (RM follow-up) Update pref references.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
20.05.x
Martin Renvoize 4 years ago
parent
commit
081a4c75be
Signed by: martin.renvoize GPG Key ID: 422B469130441A0F
  1. 2
      C4/UsageStats.pm
  2. 8
      koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
  3. 6
      opac/sco/sco-main.pl
  4. 2
      t/db_dependent/UsageStats.t

2
C4/UsageStats.pm

@ -198,7 +198,7 @@ sub BuildReport {
UpdateTotalIssuesOnCirc
UseTablesortForCirc
WaitingNotifyAtCheckin
AllowSelfCheckReturns
SCOAllowCheckin
AutoSelfCheckAllowed
FRBRizeEditions
OPACFRBRizeEditions

8
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="" />

6
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;

2
t/db_dependent/UsageStats.t

@ -459,7 +459,7 @@ sub mocking_systempreferences_to_a_set_value {
UpdateTotalIssuesOnCirc
UseTablesortForCirc
WaitingNotifyAtCheckin
AllowSelfCheckReturns
SCOAllowCheckin
AutoSelfCheckAllowed
FRBRizeEditions
OPACFRBRizeEditions

Loading…
Cancel
Save