diff --git a/Koha/Hold.pm b/Koha/Hold.pm index d4a022e3ac..18b34ab5f8 100644 --- a/Koha/Hold.pm +++ b/Koha/Hold.pm @@ -1232,6 +1232,16 @@ sub store { $self = $self->SUPER::store; } +=head3 _set_default_expirationdate + + $hold->_set_default_expirationdate; + +Internal method to set the default expiration date based on +C and C +system preferences. + +=cut + sub _set_default_expirationdate { my $self = shift; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt index 2c9dad69de..2665b52121 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -1539,7 +1539,7 @@ [% INCLUDE 'datatables.inc' %] [% INCLUDE 'calendar.inc' %] [% INCLUDE 'select2.inc' %] - [% Asset.js("js/holds.js") | $raw %] @@ -1609,36 +1609,36 @@ $.fn.select2.defaults.set("width", "100%"); $.fn.select2.defaults.set("dropdownAutoWidth", true); - $(document).ready(function() { - biblionumbers.forEach(function(biblionumber) { + $(document).ready(function () { + biblionumbers.forEach(function (biblionumber) { let branches = hold_branches[biblionumber]; let itemtypes = hold_itemtypes[biblionumber]; switch (HoldsSplitQueue) { - case 'branch': - branches.forEach(function(branch) { - load_patron_holds_table(biblionumber, {name: HoldsSplitQueue, value: branch}); + case "branch": + branches.forEach(function (branch) { + load_patron_holds_table(biblionumber, { name: HoldsSplitQueue, value: branch }); }); break; - case 'itemtype': - itemtypes.forEach(function(itemtype) { - load_patron_holds_table(biblionumber, {name: HoldsSplitQueue, value: itemtype}); + case "itemtype": + itemtypes.forEach(function (itemtype) { + load_patron_holds_table(biblionumber, { name: HoldsSplitQueue, value: itemtype }); }); break; - case 'branch_itemtype': - branches.forEach(function(branch) { - itemtypes.forEach(function(itemtype) { - load_patron_holds_table(biblionumber, {name: HoldsSplitQueue, value: branch + '_' + itemtype}); + case "branch_itemtype": + branches.forEach(function (branch) { + itemtypes.forEach(function (itemtype) { + load_patron_holds_table(biblionumber, { name: HoldsSplitQueue, value: branch + "_" + itemtype }); }); }); break; default: - load_patron_holds_table(biblionumber, {name: 'any', value: 'any'}); + load_patron_holds_table(biblionumber, { name: "any", value: "any" }); } }); - $('#cancellation-reason-div').hide(); - $('.rank-request').on('change', function() { - if ( $(".rank-request option:selected[value='del']").length ) { - $('#cancellation-reason-div').show(); + $("#cancellation-reason-div").hide(); + $(".rank-request").on("change", function () { + if ($(".rank-request option:selected[value='del']").length) { + $("#cancellation-reason-div").show(); } else { $("#cancellation-reason-div").hide(); } @@ -1995,11 +1995,9 @@ }); } - if(!localStorage.selectedHolds || document.referrer.replace(/\?.*/, '') !== document.location.origin+document.location.pathname) { + if (!localStorage.selectedHolds || document.referrer.replace(/\?.*/, "") !== document.location.origin + document.location.pathname) { localStorage.selectedHolds = []; } - - });