From 50b2758ddc728ed499c36b56f937a3c0eed545ae Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Fri, 5 Sep 2014 11:35:55 -0400 Subject: [PATCH] Bug 12878 - Not having the permission circulate_override_renewals triggers error that prevents checkouts table from loading Not having the override_renewals permission will trigger the following error on circulation.pl: Uncaught SyntaxError: Unexpected token ; This prevents the rest of the javascript on the page from executing, including but not limited to the loading of the checkouts table. Test Plan: 1) Using an account without the override renewals permission, start to check out items to a patron. 2) Note the checkouts table is broken 3) Apply this patch 4) Reload the page 5) Note the checkouts table is now working --- .../prog/en/modules/circ/circulation.tt | 2 +- .../prog/en/modules/members/moremember.tt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 9734c0f..41091f5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -32,7 +32,7 @@ var theme = "[% theme %]"; var borrowernumber = "[% borrowernumber %]"; var branchcode = "[% branch %]"; var exports_enabled = "[% exports_enabled %]"; -var AllowRenewalLimitOverride = [% CAN_user_circulate_override_renewals && AllowRenewalLimitOverride %]; +var AllowRenewalLimitOverride = [% ( CAN_user_circulate_override_renewals && Koha.Preference('AllowRenewalLimitOverride') ) || 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 8b3fbdd..bbe1aff 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -26,7 +26,7 @@ var theme = "[% theme %]"; var borrowernumber = "[% borrowernumber %]"; var branchcode = "[% branch %]"; var exports_enabled = "[% exports_enabled %]"; -var AllowRenewalLimitOverride = [% CAN_user_circulate_override_renewals && AllowRenewalLimitOverride %]; +var AllowRenewalLimitOverride = [% ( CAN_user_circulate_override_renewals && AllowRenewalLimitOverride ) || 0 %]; var relatives_borrowernumbers = new Array(); [% FOREACH b IN relatives_borrowernumbers %] relatives_borrowernumbers.push("[% b %]"); -- 1.7.2.5