Bugzilla – Attachment 140233 Details for
Bug 27421
Porting tools/stage-marc-import.pl to BackgroundJob
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 27421: (QA follow-up) Template polishing
Bug-27421-QA-follow-up-Template-polishing.patch (text/plain), 3.14 KB, created by
Marcel de Rooy
on 2022-09-06 12:49:07 UTC
(
hide
)
Description:
Bug 27421: (QA follow-up) Template polishing
Filename:
MIME Type:
Creator:
Marcel de Rooy
Created:
2022-09-06 12:49:07 UTC
Size:
3.14 KB
patch
obsolete
>From bdb394b1cef446c6a284656d4f0c0d428d9a33a8 Mon Sep 17 00:00:00 2001 >From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Date: Tue, 6 Sep 2022 12:14:02 +0000 >Subject: [PATCH] Bug 27421: (QA follow-up) Template polishing >Content-Type: text/plain; charset=utf-8 > >The completed alert needs a condition on status. >The record_type variable needs a bit of 'context'. > >Test plan: >Verify if a failed or new job does not have a Completed alert. > >Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >--- > .../includes/background_jobs/marc_import_commit_batch.inc | 4 +++- > .../includes/background_jobs/marc_import_revert_batch.inc | 4 +++- > .../en/includes/background_jobs/stage_marc_for_import.inc | 6 +++++- > 3 files changed, 11 insertions(+), 3 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/marc_import_commit_batch.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/marc_import_commit_batch.inc >index 3d358f9b83..8d830990cc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/marc_import_commit_batch.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/marc_import_commit_batch.inc >@@ -3,7 +3,9 @@ > [% BLOCK report %] > [% SET report = job.report %] > [% IF report %] >- <div class="dialog message">Completed import of records</div> >+ [% IF job.status == 'finished' %] >+ <div class="dialog message">Completed import of records</div> >+ [% END %] > <table> > <tr> > <td>Number of records added</td> >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 0ba816ddaf..1a849c3134 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,7 +3,9 @@ > [% BLOCK report %] > [% SET report = job.report %] > [% IF report %] >- <div class="dialog message">Success: Import reverted</div> >+ [% IF job.status == 'finished' %] >+ <div class="dialog message">Success: Import reverted</div> >+ [% END %] > <table> > <tr> > <td>Number of records deleted</td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/stage_marc_for_import.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/stage_marc_for_import.inc >index 0347d2d37f..4336b3df11 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/stage_marc_for_import.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/stage_marc_for_import.inc >@@ -3,8 +3,12 @@ > [% BLOCK report %] > [% SET report = job.report %] > [% IF report %] >+ [% IF job.status == 'finished' %] >+ <div class="dialog message">Completed staging records</div> >+ [% END %] >+ > <h2>MARC staging results</h2> >- [% SWITCH (record_type) %] >+ [% SWITCH job.decoded_data.record_type %] > [% CASE 'biblio' %] > <h3>Processing bibliographic records</h3> > [% CASE 'auth' %] >-- >2.20.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
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