From aaf4a56a457d110ad2a4dd0b99a7a820645b5870 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Thu, 13 Apr 2023 16:17:07 +0200
Subject: [PATCH] Bug 33568: Remove visibility conditions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Laurence Rault <laurence.rault@biblibre.com>
Signed-off-by: Emily Lamancusa <emily.lamancusa@montgomerycountymd.gov>
Signed-off-by: Tomás Cohen Arazi <tomascohen@theke.io>
---
 .../prog/en/modules/catalogue/detail.tt       | 28 ++++++-------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
index fab350eabc1..7640f1e7a28 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
@@ -701,7 +701,7 @@
         <table id="table_items">
             <thead>
                 [% IF (StaffDetailItemSelection) %]<th id="[% tab | html %]_checkbox" data-colname="[% tab | html %]_checkbox" class="NoSort"></th>[% END %]
-                [% IF Koha.Preference('LocalCoverImages') && ( tab == 'holdings' && itemloop_has_images || tab == 'otherholdings' && otheritemloop_has_images ) %]
+                [% IF Koha.Preference('LocalCoverImages') %]
                     <th id="[% tab | html %]_cover_image" data-colname="[% tab | html %]_cover_image">Cover image</th>
                 [% END %]
                 [% IF ( item_level_itypes ) %]<th id="[% tab | html %]_itype" data-colname="[% tab | html %]_itype">Item type</th>[% END %]
@@ -722,12 +722,12 @@
                 <th id="[% tab | html %]_dateaccessioned" data-colname="[% tab | html %]_dateaccessioned">Date accessioned</th>
                 <th id="[% tab | html %]_datelastborrowed" data-colname="[% tab | html %]_datelastborrowed">Date last borrowed</th>
                 <th id="[% tab | html %]_barcode" data-colname="[% tab | html %]_barcode">Barcode</th>
-                [% IF ( itemdata_uri ) %]<th id="[% tab | html %]_uri" data-colname="[% tab | html %]_uri">URL</th>[% END %]
-                [% IF ( itemdata_copynumber ) %]<th id="[% tab | html %]_copynumber" data-colname="[% tab | html %]_copynumber">Copy number</th>[% END %]
-                [% IF ( itemdata_stocknumber ) %]<th id="[% tab | html %]_stocknumber" data-colname="[% tab | html %]_stocknumber">Inventory number</th>[% END %]
-                [% IF materials %]<th id="[% tab | html %]_materials" data-colname="[% tab | html %]_materials">Materials specified</th>[% END %]
-                [% IF ( itemdata_itemnotes ) %]<th id="[% tab | html %]_itemnotes" data-colname="[% tab | html %]_itemnotes">Public notes</th>[% END %]
-                [% IF ( itemdata_nonpublicnotes ) %]<th id="[% tab | html %]_itemnotes_nonpublic" data-colname="[% tab | html %]_itemnotes_nonpublic">Non-public notes</th>[% END %]
+                <th id="[% tab | html %]_uri" data-colname="[% tab | html %]_uri">URL</th>
+                <th id="[% tab | html %]_copynumber" data-colname="[% tab | html %]_copynumber">Copy number</th>
+                <th id="[% tab | html %]_stocknumber" data-colname="[% tab | html %]_stocknumber">Inventory number</th>
+                <th id="[% tab | html %]_materials" data-colname="[% tab | html %]_materials">Materials specified</th>
+                <th id="[% tab | html %]_itemnotes" data-colname="[% tab | html %]_itemnotes">Public notes</th>
+                <th id="[% tab | html %]_itemnotes_nonpublic" data-colname="[% tab | html %]_itemnotes_nonpublic">Non-public notes</th>
                 [% IF ( hostrecords ) %]<th id="[% tab | html %]_hostrecord" data-colname="[% tab | html %]_hostrecord">Host records</th>[% END %]
                 [% IF ( analyze ) %]<th id="[% tab | html %]_usedin" data-colname="[% tab | html %]_usedin">Used in</th><th></th>[% END %]
                 [% IF ( ShowCourseReserves ) %]<th id="[% tab | html %]_course_reserves" data-colname="[% tab | html %]_course_reserves">Course reserves</th>[% END %]
@@ -2517,7 +2517,7 @@
                 }
             },
             [% END %]
-            [% IF Koha.Preference('LocalCoverImages') && ( tab == 'holdings' && itemloop_has_images || tab == 'otherholdings' && otheritemloop_has_images ) %]
+            [% IF Koha.Preference('LocalCoverImages') %]
             {
                 data: "",
                 className: "cover",
@@ -2684,7 +2684,6 @@
                     return row.external_id; // FIXME Display link to moredetail
                 }
             },
-            [% IF itemdata_uri %]
             {
                 data: "me.uri",
                 className: "uri",
@@ -2694,8 +2693,6 @@
                     return row.uri; // FIXME Display link
                 }
             },
-            [% END %]
-            [% IF ( itemdata_copynumber ) %]
             {
                 data: "me.copy_number",
                 className: "copynumber",
@@ -2705,8 +2702,6 @@
                     return row.copy_number; // FIXME Display str version
                 }
             },
-            [% END %]
-            [% IF ( itemdata_stocknumber ) %]
             {
                 data: "me.inventory_number",
                 className: "stocknumber",
@@ -2716,8 +2711,6 @@
                     return row.inventory_number;
                 }
             },
-            [% END %]
-            [% IF materials %]
             {
                 data: "me.materials_notes",
                 className: "materials",
@@ -2727,8 +2720,6 @@
                     return row.materials_notes;
                 }
             },
-            [% END %]
-            [% IF ( itemdata_itemnotes ) %]
             {
                 data: "me.public_notes",
                 className: "itemnotes",
@@ -2738,8 +2729,6 @@
                     return row.public_notes; // FIXME Replace \n with br
                 }
             },
-            [% END %]
-            [% IF itemdata_nonpublicnotes %]
             {
                 data: "me.internal_notes",
                 className: "nonpublicnote",
@@ -2749,7 +2738,6 @@
                     return row.internal_notes;
                 }
             },
-            [% END %]
             [% IF ( hostrecords ) %]
             {
                 data: "",
-- 
2.34.1