Bugzilla – Attachment 46835 Details for
Bug 12920
Remove AllowRenewalLimitOverride from pl scripts, use Koha.Preference instead
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
bug 12920 - Remove AllowRenewalLimitOverride from pl scripts and tt files, use Koha.Preference instead
bug-12920---Remove-AllowRenewalLimitOverride-from-.patch (text/plain), 3.80 KB, created by
natasha
on 2016-01-19 00:59:18 UTC
(
hide
)
Description:
bug 12920 - Remove AllowRenewalLimitOverride from pl scripts and tt files, use Koha.Preference instead
Filename:
MIME Type:
Creator:
natasha
Created:
2016-01-19 00:59:18 UTC
Size:
3.80 KB
patch
obsolete
>From 68db3ff860fe5fe9a7f86c68576adaa66360422a Mon Sep 17 00:00:00 2001 >From: Natasha <tasham_8@hotmail.com> >Date: Tue, 19 Jan 2016 00:56:56 +0000 >Subject: [PATCH] bug 12920 - Remove AllowRenewalLimitOverride from pl scripts > and tt files, use Koha.Preference instead > >Test Plan: >1) Apply this patch >2) Go to circulation.pl >3) Ensure you can still override renewal limits with pref enabled >4) Ensure you can not override renewal limits with pref disabled >5) Go to moremember.pl >6) Repeat steps 3-4 >--- > circ/circulation.pl | 1 - > koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt | 2 +- > members/moremember.pl | 1 - > 4 files changed, 2 insertions(+), 4 deletions(-) > >diff --git a/circ/circulation.pl b/circ/circulation.pl >index 5747fbf..fb47d07 100755 >--- a/circ/circulation.pl >+++ b/circ/circulation.pl >@@ -638,7 +638,6 @@ $template->param( > debt_confirmed => $debt_confirmed, > SpecifyDueDate => $duedatespec_allow, > CircAutocompl => C4::Context->preference("CircAutocompl"), >- AllowRenewalLimitOverride => C4::Context->preference("AllowRenewalLimitOverride"), > canned_bor_notes_loop => $canned_notes, > debarments => GetDebarments({ borrowernumber => $borrowernumber }), > todaysdate => output_pref( { dt => dt_from_string()->set(hour => 23)->set(minute => 59), dateformat => 'sql' } ), >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >index 7c5573a..51ef890 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >@@ -37,7 +37,7 @@ var theme = "[% theme %]"; > var borrowernumber = "[% borrowernumber %]"; > var branchcode = "[% branch %]"; > var exports_enabled = "[% exports_enabled %]"; >-var AllowRenewalLimitOverride = [% (CAN_user_circulate_override_renewals && AllowRenewalLimitOverride)? 1: 0 %]; >+var AllowRenewalLimitOverride = [% (CAN_user_circulate_override_renewals && Koha.Preference('AllowRenewalLimitOverride') )? 1: 0 %]; > var AllowCirculate = [% (CAN_user_circulate_circulate_remaining_permissions)? 1 : 0 %]; > var script = "circulation"; > var relatives_borrowernumbers = new Array(); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >index 57bd588..153e121 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >@@ -34,7 +34,7 @@ var borrowernumber = "[% borrowernumber %]"; > var branchcode = "[% branch %]"; > var exports_enabled = "[% exports_enabled %]"; > var AllowCirculate = [% (CAN_user_circulate_circulate_remaining_permissions)? 1 : 0 %] >-var AllowRenewalLimitOverride = [% (CAN_user_circulate_override_renewals && AllowRenewalLimitOverride)? 1: 0 %]; >+var AllowRenewalLimitOverride = [% (CAN_user_circulate_override_renewals && Koha.Preference('AllowRenewalLimitOverride') )? 1: 0 %]; > var script = "moremember"; > var relatives_borrowernumbers = new Array(); > [% FOREACH b IN relatives_borrowernumbers %] >diff --git a/members/moremember.pl b/members/moremember.pl >index 482f2a2..03f716a 100755 >--- a/members/moremember.pl >+++ b/members/moremember.pl >@@ -332,7 +332,6 @@ if (C4::Context->preference('EnhancedMessagingPreferences')) { > $template->param( $data->{'categorycode'} => 1 ); > $template->param( > detailview => 1, >- AllowRenewalLimitOverride => C4::Context->preference("AllowRenewalLimitOverride"), > roadtype => $roadtype, > borrowernumber => $borrowernumber, > othernames => $data->{'othernames'}, >-- >1.7.10.4
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 12920
:
31596
|
46835
|
46991
|
46992
|
47604
|
47605
|
47789
|
47790