From 437db76c0114f98273558a453acc4b7791823d87 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Wed, 27 Apr 2016 15:13:27 +0000 Subject: [PATCH] Bug 11565 [QA Followup] - Only hide options when none are in use --- .../intranet-tmpl/prog/en/js/pages/circulation.js | 9 +++++++++ .../intranet-tmpl/prog/en/modules/circ/circulation.tt | 19 ------------------- 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/pages/circulation.js b/koha-tmpl/intranet-tmpl/prog/en/js/pages/circulation.js index 92dba4b..3a35fba 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/js/pages/circulation.js +++ b/koha-tmpl/intranet-tmpl/prog/en/js/pages/circulation.js @@ -49,6 +49,15 @@ $(document).ready(function() { var checkout_settings = $(".checkout-settings"); var checkout_settings_icon = $(".checkout-settings-icon"); + // If any checkboxes in the checkout settings are selected, show the settings by default + if ( $(".checkout-settings input:checked,#duedatespec[value!='']").length ) { + checkout_settings.show(); + checkout_settings_icon.removeClass("fa-caret-right").addClass("fa-caret-down"); + } else { + checkout_settings.hide(); + checkout_settings_icon.removeClass("fa-caret-down").addClass("fa-caret-right"); + } + $("#show-checkout-settings a").on("click",function(){ if( checkout_settings.is(":hidden")){ checkout_settings.show(); 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 731a8c9..9215488 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -661,25 +661,6 @@ No patron matched [% message %]
- - [% IF Koha.Preference('decreaseLoanHighHolds') %] - [% IF NEEDSCONFIRMATION %] - [% IF override_high_holds %] - - [% ELSE %] - - [% END %] - [% ELSE %] - [% IF override_high_holds %] - - [% ELSE %] - - [% END %] - [% END %] - - [% END %] - - [% UNLESS ( noissues && Koha.Preference('OnSiteCheckoutsForce') ) %] [% IF ( SpecifyDueDate ) %]
-- 2.1.4