From c45d4007245989466a6f40ccf4851a9a97b83245 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 16 Mar 2020 16:56:13 +0100 Subject: [PATCH] Bug 21296: [18.11.x] Fix wrong resolution conflict On commit a230878b6f3d3afa5d7f33c9d816bd6272c5b1a1 Bug 21296: suspend hold ignores system preference on intranet See comment 10. --- koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 3 +-- 1 file changed, 1 insertion(+), 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 bf14dab301..1eb71bb2aa 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -982,6 +982,7 @@ No patron matched [% message | html %] var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export"); var MSG_CONFIRM_DELETE_MESSAGE = _("Are you sure you want to delete this message? This cannot be undone."); + columns_settings = [% ColumnsSettings.GetColumns( 'circ', 'circulation', 'issues-table', 'json' ) | $raw %] var SuspendHoldsIntranet = [% ( Koha.Preference('SuspendHoldsIntranet') ) ? 1 : 0 | html %]; [% Asset.js("js/pages/circulation.js") | $raw %] @@ -989,8 +990,6 @@ No patron matched [% message | html %] [% Asset.js("js/holds.js") | $raw %] [% Asset.js("js/circ-patron-search-results.js") | $raw %]