Attachment 148570 Details for Bug 33316 – Bug 33316: Improve display

[patch] Bug 33316: Improve display

Bug-33316-Improve-display.patch (text/plain), 2.17 KB, created by Nick Clemens (kidclamp) on 2023-03-22 19:55:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nick Clemens (kidclamp)

Created: 2023-03-22 19:55:06 UTC

Size: 2.17 KB

patch

obsolete

>From c35c2a51a2ed87c464990bcbc049cd8733f5553e Mon Sep 17 00:00:00 2001
>From: Nick Clemens <nick@bywatersolutions.com>
>Date: Wed, 22 Mar 2023 19:54:48 +0000
>Subject: [PATCH] Bug 33316: Improve display
>
>---
> .../background_jobs/update_elastic_index.inc  | 26 +++++++++++++------
> 1 file changed, 18 insertions(+), 8 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/update_elastic_index.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/update_elastic_index.inc
>index d6f24e89a9..d50f7651c8 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/update_elastic_index.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/update_elastic_index.inc
>@@ -1,18 +1,19 @@
> [% USE Koha %]
> 
>+[% SET report = job.decoded_data %]
> [% BLOCK report %]
>-    [% SET report = job.report %]
>-    [% IF report %]
>-        [% IF report.total_records == 1 %]
>-            [% IF report.total_success == 1 %]
>-                <div class="dialog message">The records have successfully been reindexed!</div>
>-            [% END %]
>+    [% IF job.status == 'finished' %]
>+        [% IF report %]
>+            <div class="dialog message">
>+                [% report.record_ids.size | html %] records have successfully been reindexed.
>+            </div>
>         [% ELSE %]
>             <div class="dialog message">
>-                [% report.total_success | html %] / [% report.total_records | html %] records have successfully been reindexed. Some errors occurred.
>-                [% IF job.status == 'cancelled' %]<span>The job has been cancelled before it finished.</span>[% END %]
>+               Job data could not be read, see the logs for details
>             </div>
>         [% END %]
>+    [% ELSIF job.status == 'cancelled' %]
>+        <span>The job has been cancelled before it finished.</span>
>     [% END %]
> [% END %]
> 
>@@ -32,7 +33,16 @@
>             [% END %]
>         </div>
>     [% END %]
>+    [% IF report %]
>+        <h2> Record ids:</h2>
>+        <ul>
>+        [% FOREACH record_id IN report.record_ids %]
>+            <li>[% record_id | html %]</li>
>+        [% END %]
>+        </ul>
>+    [% END %]
> [% END %]
> 
>+
> [% BLOCK js %]
> [% END %]
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 33316: 148570 | 148576 | 149394 | 149395 | 149396 | 149397 | 149585 | 149586