From d6b1b653e0c3c6332024dea971d9d799d9f4aad0 Mon Sep 17 00:00:00 2001
From: Josef Moravec <josef.moravec@gmail.com>
Date: Mon, 25 Jun 2018 11:27:03 +0000
Subject: [PATCH] Bug 19902: (follow-up) Deal with patron column regarding on
 intranetreadinghistory setting

Test plan:
Try it with intranetreadinghistory allowed and not allowed and it should
still work in both cases

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
---
 .../prog/en/modules/catalogue/issuehistory.tt          | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt
index 3900344f86..8509387baa 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt
@@ -26,12 +26,14 @@
 <h1>Checkout history for [% biblio.title |html %]</h1>
 [% IF biblio.author %]<h3>by [% biblio.author %]</h3>[% END %]
 
+[% SET show_patron_column = Koha.Preference('intranetreadinghistory') AND CAN_user_circulate_circulate_remaining_permissions %]
+
 <div class="searchresults">
     [% IF checkouts %]
         <h4>Checked out [% checkouts.size %] times</h4>
         <table id="table_issues">
             <thead><tr>
-            [% IF Koha.Preference('intranetreadinghistory') AND CAN_user_circulate_circulate_remaining_permissions %]
+            [% IF show_patron_column %]
             <th>Patron</th>
             [% END %]
             <th>Barcode</th>
@@ -44,7 +46,7 @@
             <tbody>
         [% FOREACH checkout IN checkouts %]
             <tr>
-                [% IF Koha.Preference('intranetreadinghistory') AND CAN_user_circulate_circulate_remaining_permissions %]
+                [% IF show_patron_column %]
                 <td>[% INCLUDE 'patron-title.inc' patron => checkout.patron hide_patron_infos_if_needed=1 %]</td>
                 [% END %]
                 <td>
@@ -103,6 +105,10 @@
     <script type="text/javascript" id="js">
         $(document).ready(function() {
             var columns_settings = [% ColumnsSettings.GetColumns('catalogue', 'detail', 'checkoutshistory-table', 'json') %];
+            [% UNLESS show_patron_column %]
+            // Remove the patron column definition
+            columns_settings.splice(0,1);
+            [% END %]
             var table = KohaTable("table_issues", {
                 "aoColumnDefs": [
                     { "sType": "title-string", "aTargets" : [ "title-string" ] }
-- 
2.39.5