Attachment 153230 Details for Bug 33817 – Bug 33817: (follow-up) Fix spec and messages

[patch] Bug 33817: (follow-up) Fix spec and messages

Bug-33817-follow-up-Fix-spec-and-messages.patch (text/plain), 3.19 KB, created by Katrin Fischer on 2023-07-09 15:30:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2023-07-09 15:30:54 UTC

Size: 3.19 KB

patch

obsolete

>From 67eabeaddf40cc1de537d05f3fbdf7d710706311 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Tue, 27 Jun 2023 12:03:58 +0100
>Subject: [PATCH] Bug 33817: (follow-up) Fix spec and messages
>
>This patch should resolve the issues highlighted at signoff time by
>Victor.
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> api/v1/swagger/paths/items.yaml                             | 4 ++++
> koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt | 6 +++++-
> 2 files changed, 9 insertions(+), 1 deletion(-)
>
>diff --git a/api/v1/swagger/paths/items.yaml b/api/v1/swagger/paths/items.yaml
>index 01b8d795d5..f9aa9301d1 100644
>--- a/api/v1/swagger/paths/items.yaml
>+++ b/api/v1/swagger/paths/items.yaml
>@@ -308,6 +308,10 @@
>         description: Bad parameter
>         schema:
>           $ref: "../swagger.yaml#/definitions/error"
>+      "409":
>+        description: Conflict in creating resource
>+        schema:
>+          $ref: "../swagger.yaml#/definitions/error"
>       "401":
>         description: Authentication required
>         schema:
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
>index 8ec3e12a0b..c88e5717b4 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
>@@ -1978,6 +1978,8 @@
>                           var response = data.responseJSON;
>                           if ( response.error_code === 'already_bundled' ) {
>                               $('#addResult').replaceWith('<div id="addResult" class="alert alert-warning">'+_("Warning: Item '%s' already attached").format(barcode)+'</div>');
>+                          } else if (response.error_code === 'bundle_checkout_out') {
>+                              $('#addResult').replaceWith('<div id="addResult" class="alert alert-danger">'+_("Failure: Bundle is currently checked out")+'</div>');
>                           } else if (response.error_code === 'checked_out') {
>                               const button = $('<button type="button">')
>                                 .addClass('btn btn-xs')
>@@ -2091,7 +2093,9 @@
>                             var barcode = $('#rm_external_id').val();
>                             if ( data.status === 409 ) {
>                                 var response = data.responseJSON;
>-                                if ( response.key === "PRIMARY" ) {
>+                                if (response.error_code === 'bundle_checkout_out') {
>+                                    $('#removeResult').replaceWith('<div id="removeResult" class="alert alert-danger">'+_("Failure: Bundle is currently checked out")+'</div>');
>+                                } else if ( response.key === "PRIMARY" ) {
>                                     $('#removeResult').replaceWith('<div id="removeResult" class="alert alert-warning">'+_("Warning: Item '%s' already attached").format(barcode)+'</div>');
>                                 } else {
>                                     $('#removeResult').replaceWith('<div id="removeResult" class="alert alert-danger">'+_("Failure: Item '%s' belongs to another bundle").format(barcode)+'</div>');
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 33817: 151623 | 151660 | 151662 | 151663 | 152723 | 152724 | 152725 | 153228 | 153229 | 153230 | 153293