Bugzilla – Attachment 50820 Details for
Bug 11565
decreaseLoanHighHolds needs Override
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 11565 [QA Followup] - Only hide options when none are in use
Bug-11565-QA-Followup---Only-hide-options-when-non.patch (text/plain), 3.20 KB, created by
Kyle M Hall (khall)
on 2016-04-27 15:35:32 UTC
(
hide
)
Description:
Bug 11565 [QA Followup] - Only hide options when none are in use
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2016-04-27 15:35:32 UTC
Size:
3.20 KB
patch
obsolete
>From 437db76c0114f98273558a453acc4b7791823d87 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >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 <span class="ex">[% message %]</span> > > <div class="checkout-settings"> > >- <span class="circ-override-high-holds"> >- [% IF Koha.Preference('decreaseLoanHighHolds') %] >- [% IF NEEDSCONFIRMATION %] >- [% IF override_high_holds %] >- <input type="checkbox" name="override_high_holds" id="override_high_holds" value="1" disabled="disabled" checked="checked"/> >- [% ELSE %] >- <input type="checkbox" name="override_high_holds" id="override_high_holds" value="1" disabled="disabled"/> >- [% END %] >- [% ELSE %] >- [% IF override_high_holds %] >- <input type="checkbox" name="override_high_holds" id="override_high_holds" value="1" checked="checked" /> >- [% ELSE %] >- <input type="checkbox" name="override_high_holds" id="override_high_holds" value="1" /> >- [% END %] >- [% END %] >- <label for="override_high_holds">Don't decrease loan length based on holds</label> >- [% END %] >- </span> >- > [% UNLESS ( noissues && Koha.Preference('OnSiteCheckoutsForce') ) %] > [% IF ( SpecifyDueDate ) %] > <div id="specify-due-date" class="checkout-setting"> >-- >2.1.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 11565
:
42976
|
43160
|
43600
|
48679
|
49409
|
49937
|
50798
|
50799
|
50800
|
50815
|
50817
|
50818
|
50820
|
50821
|
50822
|
50828
|
50829