From 7ae8c3fb1761b389dd817e2e9cc3191db64a7c36 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Mon, 15 Sep 2014 06:48:33 -0400 Subject: [PATCH] Bug 12920 - Remove AllowRenewalLimitOverride from pl scripts, use Koha.Preference instead Per the new guidelines, AllowRenewalLimitOverride should not be referenced in circulation.pl or moremember.pl 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 - .../prog/en/modules/circ/circulation.tt | 3 ++- .../prog/en/modules/members/moremember.tt | 3 ++- members/moremember.pl | 1 - 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/circ/circulation.pl b/circ/circulation.pl index c766e88..cefe79b 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -569,7 +569,6 @@ $template->param( debt_confirmed => $debt_confirmed, SpecifyDueDate => $duedatespec_allow, CircAutocompl => C4::Context->preference("CircAutocompl"), - AllowRenewalLimitOverride => C4::Context->preference("AllowRenewalLimitOverride"), export_remove_fields => C4::Context->preference("ExportRemoveFields"), export_with_csv_profile => C4::Context->preference("ExportWithCsvProfile"), canned_bor_notes_loop => $canned_notes, 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 2838138..72004a4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -1,3 +1,4 @@ +[% USE Koha %] [% USE Branches %] [% USE KohaDates %] [% IF ( export_remove_fields OR export_with_csv_profile ) %] @@ -32,7 +33,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 relatives_borrowernumbers = new Array(); [% FOREACH b IN relatives_borrowernumbers %] relatives_borrowernumbers.push("[% b %]"); 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 794e383..64525a0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -1,3 +1,4 @@ +[% USE Koha %] [% USE KohaDates %] [% INCLUDE 'doc-head-open.inc' %] Koha › Patrons › @@ -26,7 +27,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 relatives_borrowernumbers = new Array(); [% FOREACH b IN relatives_borrowernumbers %] relatives_borrowernumbers.push("[% b %]"); diff --git a/members/moremember.pl b/members/moremember.pl index b1df1dd..3c078d1 100755 --- a/members/moremember.pl +++ b/members/moremember.pl @@ -345,7 +345,6 @@ my $address = $data->{'streetnumber'} . " $roadtype " . $data->{'address'}; $template->param( $data->{'categorycode'} => 1 ); $template->param( detailview => 1, - AllowRenewalLimitOverride => C4::Context->preference("AllowRenewalLimitOverride"), CANDELETEUSER => $candeleteuser, roadtype => $roadtype, borrowernumber => $borrowernumber, -- 1.7.2.5