From b25f34536bd86b828a1b22a6ad404025a1e18edb Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 20 Dec 2021 12:02:45 +0100 Subject: [PATCH] Bug 29735: Remove flatpickr init from categories.js and holds.js Same as bug 29394, we want the flatpickr instanciations be done at the same place, from calendar.inc. That way they will all behave identically. Test plan: Edit a patron category and confirm that the "until date" calendar has the "yesterday" and "today" dates disabled Place a hold on an item, go to the patron detail page, click the "holds" tab, suspend. That should trigger a modal that will display a calendar with "yesterday" and "today" dates disabled --- koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt | 2 +- .../intranet-tmpl/prog/en/modules/members/moremember.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt | 2 +- koha-tmpl/intranet-tmpl/prog/js/categories.js | 4 ---- koha-tmpl/intranet-tmpl/prog/js/holds.js | 5 +---- 5 files changed, 4 insertions(+), 11 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt index 9b1d6bfa2a3..a5e5b8e85f3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt @@ -157,7 +157,7 @@
  • - +
  • 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 f456dff8f9f..7bbd76cde40 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -857,7 +857,6 @@ [% INCLUDE 'datatables.inc' %] [% Asset.js("lib/jquery/plugins/rowGroup/dataTables.rowGroup.min.js") | $raw %] [% INCLUDE 'columns_settings.inc' %] - [% INCLUDE 'calendar.inc' %] [% Asset.js("lib/jquery/plugins/jquery-ui-timepicker-addon.min.js") | $raw %] [% INCLUDE 'timepicker.inc' %] [% INCLUDE 'select2.inc' %] @@ -887,6 +886,7 @@ [% Asset.js("js/pages/circulation.js") | $raw %] [% Asset.js("js/checkouts.js") | $raw %] [% Asset.js("js/holds.js") | $raw %] + [% INCLUDE 'calendar.inc' %] [% INCLUDE 'str/members-menu.inc' %] [% Asset.js("js/members-menu.js") | $raw %]