Attachment 139449 Details for Bug 27421 – Bug 27421: (QA follow-up) Similar changes for revert commit

[patch] Bug 27421: (QA follow-up) Similar changes for revert commit

Bug-27421-QA-follow-up-Similar-changes-for-revert-.patch (text/plain), 3.10 KB, created by Marcel de Rooy on 2022-08-19 08:00:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel de Rooy

Created: 2022-08-19 08:00:15 UTC

Size: 3.10 KB

patch

obsolete

>From 308c495ac7abe850dd7c1f64d995d17d46d9894a Mon Sep 17 00:00:00 2001
>From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>Date: Fri, 19 Aug 2022 07:34:06 +0000
>Subject: [PATCH] Bug 27421: (QA follow-up) Similar changes for revert commit
>Content-Type: text/plain; charset=utf-8
>
>Test plan:
>Look at job results when reverting imported batch.
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>---
> Koha/BackgroundJob/MARCImportRevertBatch.pm   |  1 +
> .../marc_import_revert_batch.inc              | 25 ++++++++++---------
> 2 files changed, 14 insertions(+), 12 deletions(-)
>
>diff --git a/Koha/BackgroundJob/MARCImportRevertBatch.pm b/Koha/BackgroundJob/MARCImportRevertBatch.pm
>index a1cdaeb28b..bd125a07e8 100644
>--- a/Koha/BackgroundJob/MARCImportRevertBatch.pm
>+++ b/Koha/BackgroundJob/MARCImportRevertBatch.pm
>@@ -83,6 +83,7 @@ sub process {
>         num_errors        => $num_errors,
>         num_reverted      => $num_reverted,
>         num_ignored       => $num_ignored,
>+        import_batch_id   => $import_batch_id,
>     };
> 
>     my $data = $self->decoded_data;
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/marc_import_revert_batch.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/marc_import_revert_batch.inc
>index 2ad8117ded..0ba816ddaf 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/marc_import_revert_batch.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/marc_import_revert_batch.inc
>@@ -3,31 +3,32 @@
> [% BLOCK report %]
>     [% SET report = job.report %]
>     [% IF report %]
>-        <div class="dialog message">Success: Import reversed</div>
>+        <div class="dialog message">Success: Import reverted</div>
>         <table>
>             <tr>
>                 <td>Number of records deleted</td>
>                 <td>[% report.num_deleted | html %]</td>
>             </tr>
>-            [% IF ( report.record_type == 'biblio' ) %]
>-                <tr>
>-                    <td>Number of items deleted</td>
>-                    <td>[% report.num_items_deleted | html %]</td>
>-                </tr>
>-                <tr>
>-                    <td>Number of records not deleted due to items on loan</td>
>-                    <td>[% report.num_errors | html %]</td>
>-                </tr>
>-            [% END %]
>             <tr>
>-                <td>Number of records changed back</td>
>+                <td>Number of records reverted</td>
>                 <td>[% report.num_reverted | html %]</td>
>             </tr>
>             <tr>
>                 <td>Number of records ignored</td>
>                 <td>[% report.num_ignored | html %]</td>
>             </tr>
>+            <tr>
>+                <td>Number of items deleted</td>
>+                <td>[% report.num_items_deleted | html %]</td>
>+            </tr>
>+            <tr>
>+                <td>Number of errors</td>
>+                <td>[% report.num_errors | html %]</td>
>+            </tr>
>         </table>
>+        <p>
>+            <a href="/cgi-bin/koha/tools/manage-marc-import.pl?import_batch_id=[% report.import_batch_id | url %]">Manage reverted batch</a>
>+        </p>
>     [% END %]
> [% END %]
> 
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 27421: 136127 | 136128 | 136129 | 136216 | 136217 | 136338 | 136339 | 138642 | 138643 | 138656 | 138657 | 138660 | 138881 | 139384 | 139385 | 139386 | 139387 | 139388 | 139448 | 139449 | 139450 | 139797 | 140205 | 140206 | 140207 | 140208 | 140223 | 140224 | 140225 | 140226 | 140227 | 140228 | 140229 | 140230 | 140231 | 140232 | 140233 | 140234 | 140759