From fe02563aa6c15939b273e9249187424a213cdb03 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Thu, 24 May 2018 18:51:03 +0000
Subject: [PATCH] Bug 20814: Display issue with 'Saved reports' tabs when
 memcached is off

This patch changes the configuration of the saved reports table so that
columns which were previously excluded from the table altogether are now
hidden. This prevents a JavaScript error when DataTables tries to
reference a missing column.

To test, apply the patch and go to Reports -> Use saved. You should have
at least one report category configured and assigned to reports in order
for the tabs display to be visible.

Test the table of saved reports under a variety of these circumstances:

 - memcached disabled or enabled
 - reports exist or don't exist which require update from the old
   marcxml syntax
 - cache_expiry and/or update columns are configured in Administration
   -> Columns settings to be shown or hidden

The report category tabs and the table should render correctly under all
circumstances.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 .../modules/reports/guided_reports_start.tt   | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
index 86c17e8893..9dde0263a3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
@@ -177,9 +177,17 @@ canned reports and writing custom SQL reports.</p>
                     <th class="title-string">Last run</th>
                     <th class="report_public">Public</th>
                     <th class="report_json_url">JSON URL</th>
-                    [% IF (usecache) %] <th>Cache expiry (seconds)</th> [% END %]
+                    [% IF (usecache) %]
+                        <th>Cache expiry (seconds)</th>
+                    [% ELSE %]
+                        <th class="hidden">&nbsp;</th>
+                    [% END %]
                     <th>Saved results</th>
-                    [% IF has_obsolete_reports %]<th>Update</th>[% END %]
+                    [% IF has_obsolete_reports %]
+                        <th>Update</th>
+                    [% ELSE %]
+                        <th class="hidden">&nbsp;</th>
+                    [% END %]
                     <th>Actions</th>
                 </tr>
             </thead>
@@ -221,21 +229,19 @@ canned reports and writing custom SQL reports.</p>
                             <a href="/cgi-bin/koha/svc/report?id=[% savedreport.id | uri %]">[% Koha.Preference('staffClientBaseURL') %]/cgi-bin/koha/svc/report?id=[% savedreport.id | html %]</a>
                         [% END %]
                         </td>
-                        [% IF (usecache) %] <td>[% savedreport.cache_expiry %]</td> [% END %]
+                        <td>[% savedreport.cache_expiry %]</td>
                         <td>
                             [% FOR result IN savedreport.results %]
                                 <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=retrieve%20results&amp;id=[% result.id %]">[% result.date_run %]</a>
                                 <br/>
                             [% END %]
                         </td>
-                        [% IF has_obsolete_reports %]
                         <td>
                             [% IF savedreport.seems_obsolete %]
                                 This report seems obsolete, it uses biblioitems.marcxml field.
                                 <a href="/cgi-bin/koha/svc/convert_report?report_id=[% savedreport.id %]" data-report_id="[% savedreport.id %]" class="update_sql btn btn-default btn-xs" title="Update SQL"><i class="fa fa-eye"></i> Update SQL</a>
                             [% END %]
                         </td>
-                        [% END %]
                         <td>
                             <div class="dropup">
                                 <div class="btn-group">
@@ -998,7 +1004,8 @@ $(document).ready(function() {
                         { 'bSortable': false, 'bSearchable':false, 'aTargets': [0, -1] },
                         { 'bSearchable': false, 'aTargets': [3] },
                         { "aTargets": [ 1, 2 ], "sType": "natural"  },
-                        { "sType": "title-string", "aTargets" : [ "title-string" ] }
+                        { "sType": "title-string", "aTargets" : [ "title-string" ] },
+                        { "visible": false, "aTargets" : [ "hidden" ] }
                     ],
                     'oLanguage': {
                         'sZeroRecords': _("No matching reports found")
-- 
2.39.5