Attachment 144302 Details for Bug 30719 – Bug 30719: Batch requests minor misc improvements

[patch] Bug 30719: Batch requests minor misc improvements

Bug-30719-Batch-requests-minor-misc-improvements.patch (text/plain), 4.32 KB, created by Pedro Amorim on 2022-11-28 17:42:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pedro Amorim

Created: 2022-11-28 17:42:22 UTC

Size: 4.32 KB

patch

obsolete

>From ec7d04c64439c05ef06198bc54933cbe1f95da64 Mon Sep 17 00:00:00 2001
>From: Pedro Amorim <pjamorim91@gmail.com>
>Date: Tue, 8 Nov 2022 14:53:07 -0100
>Subject: [PATCH] Bug 30719: Batch requests minor misc improvements
>
>- Fix wrong link in message in case there are no requests batch
>- Detail of batch update - View status of any request within a batch
>- Fix typo to correctly display status code on batch statuses list
>
>Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>
>---
> .../prog/en/includes/ill-batch-modal.inc             |  1 +
> .../prog/en/modules/admin/ill_batch_statuses.tt      |  4 ++--
> koha-tmpl/intranet-tmpl/prog/js/ill-batch-modal.js   | 12 +++++++++++-
> 3 files changed, 14 insertions(+), 3 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-batch-modal.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-batch-modal.inc
>index f0abfa8a64..d6df6f5bc7 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-batch-modal.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-batch-modal.inc
>@@ -74,6 +74,7 @@
>                                 <th scope="col">Identifier value</th>
>                                 <th scope="col">Metadata</th>
>                                 <th scope="col">Request ID</th>
>+                                <th scope="col">Request Status</th>
>                                 <th scope="col"></th>
>                             </tr>
>                         </thead>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/ill_batch_statuses.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/ill_batch_statuses.tt
>index 0bf6e5f53d..c47cc27e2c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/ill_batch_statuses.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/ill_batch_statuses.tt
>@@ -132,7 +132,7 @@
>                                 [% FOREACH status IN statuses %]
>                                 <tr>
>                                     <td>[% status.name | html %]</td>
>-                                    <td>[% name.code | html %]</td>
>+                                    <td>[% status.code | html %]</td>
>                                     <td>[% status.is_system ? "Yes" : "No" | html %]</td>
>                                     <td class="actions">
>                                         <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/ill_batch_statuses.pl?op=add_form&amp;code=[% status.code | uri %]"><i class="fa fa-pencil"></i> Edit</a>
>@@ -146,7 +146,7 @@
>                         </table>
>                     [% ELSE %]
>                         <div class="dialog message">
>-                            There are no batch statuses defined. <a href="/cgi-bin/koha/admin/debit_types.pl?op=add_form">Create new batch status</a>
>+                            There are no batch statuses defined. <a href="/cgi-bin/koha/admin/ill_batch_statuses.pl?op=add_form">Create new batch status</a>
>                         </div>
>                     [% END %]
>                 [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/js/ill-batch-modal.js b/koha-tmpl/intranet-tmpl/prog/js/ill-batch-modal.js
>index 70f9e29c5a..829b344eee 100644
>--- a/koha-tmpl/intranet-tmpl/prog/js/ill-batch-modal.js
>+++ b/koha-tmpl/intranet-tmpl/prog/js/ill-batch-modal.js
>@@ -299,6 +299,7 @@
>                 tableContent.data = tableContent.data.map(function (row) {
>                     if (row.value === identifier) {
>                         row.requestId = data.illrequest_id;
>+                        row.requestStatus = data.status;
>                     }
>                     return row;
>                 });
>@@ -893,6 +894,10 @@
>         return data.requestId || '-';
>     }
> 
>+    function createRequestStatus(x, y, data) {
>+        return data.requestStatus || '-';
>+    }
>+
>     function buildTable(identifiers) {
>         table = KohaTable('identifier-table', {
>             processing: true,
>@@ -918,9 +923,14 @@
>                 },
>                 {
>                     data: 'requestId',
>-                    width: '13%',
>+                    width: '6.5%',
>                     render: createRequestId
>                 },
>+                {
>+                    data: 'requestStatus',
>+                    width: '6.5%',
>+                    render: createRequestStatus
>+                },
>                 {
>                     width: '18%',
>                     render: createActions,
>-- 
>2.25.1

Actions: View | Diff | Splinter Review

Attachments on bug 30719: 144281 | 144285 | 144286 | 144287 | 144288 | 144289 | 144290 | 144291 | 144292 | 144293 | 144294 | 144295 | 144296 | 144297 | 144298 | 144299 | 144300 | 144301 | 144302 | 145760 | 145869 | 145870 | 145876 | 145934 | 146152 | 147658 | 147929 | 147930 | 147931 | 147932 | 147933 | 147934 | 147952 | 147953 | 147954 | 147955 | 147956 | 151152 | 151153 | 151154 | 151155 | 151156 | 151284 | 151285 | 151286 | 151287 | 151288 | 151303 | 151304 | 151305 | 151306 | 151307 | 151308 | 151309 | 151310 | 151311 | 151312 | 151513 | 151514 | 151515 | 151516 | 151517 | 151519 | 151520 | 151521 | 151522 | 151523 | 151571 | 151572 | 151573 | 151574 | 151575 | 151611 | 151612 | 151613 | 151614 | 151615 | 151804 | 151805 | 151806 | 151807 | 151808 | 151809 | 154046 | 154047 | 154048 | 154049 | 154050 | 154051 | 154052 | 155421 | 155422 | 155423 | 155424 | 155425 | 155426 | 155427 | 155428 | 155429 | 155430 | 155431 | 155432 | 155433 | 155434 | 155435 | 156556 | 156748 | 156749 | 156752 | 156783 | 156785 | 156811 | 156812 | 156827 | 156828