From 41213f62d4e4b9940ef5a0e808dd4299124379a5 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
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.

Signed-off-by: Hayley Mapley <hayleymapley@catalyst.net.nz>
---
 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 <span class="ex">[% message | html %]</span>
 
         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 %];
     </script>
     [% Asset.js("js/pages/circulation.js") | $raw %]
@@ -989,8 +990,6 @@ No patron matched <span class="ex">[% message | html %]</span>
     [% Asset.js("js/holds.js") | $raw %]
     [% Asset.js("js/circ-patron-search-results.js") | $raw %]
     <script>
-        columns_settings_issues_table = [% ColumnsSettings.GetColumns( 'circ', 'circulation', 'issues-table', 'json' ) | $raw %]
-        columns_settings_borrowers_table = [% ColumnsSettings.GetColumns( 'circ', 'circulation', 'table_borrowers', 'json' ) | $raw %]
 
         [% IF borrowernumber and patron %]
             if($.cookie("holdfor") != [% patron.borrowernumber | html %]){
-- 
2.39.5