Attachment 170792 Details for Bug 37739 – Bug 37739: Adjust vendor deletion modal code after bootstrap 5 update

[patch] Bug 37739: Adjust vendor deletion modal code after bootstrap 5 update

Bug-37739-Adjust-vendor-deletion-modal-code-after-.patch (text/plain), 3.57 KB, created by David Nind on 2024-08-28 00:18:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Nind

Created: 2024-08-28 00:18:48 UTC

Size: 3.57 KB

patch

obsolete

>From cd3a42000b117d7ab148299725f2b3d5089b026a Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Tue, 27 Aug 2024 11:36:38 +0200
>Subject: [PATCH] Bug 37739: Adjust vendor deletion modal code after bootstrap
> 5 update
>
>This patch fixes a conflict between bug 31921 and bug 35402.
>
>Test plan:
>Create a vendor then delete it using the "Delete vendor" button
>Confirm that the modal looks like other modals in Koha.
>Click the "x", "No" and "Yes". Confirm that "x" and "no" close the modal
>but "yes" correctly delete the vendor.
>
>Signed-off-by: David Nind <david@davidnind.com>
>---
> .../prog/en/includes/acquisitions-toolbar.inc             | 2 +-
> .../prog/en/includes/modals/delete_vendor.inc             | 8 ++++----
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc
>index 4400c1ca47..d6b6ff9f98 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc
>@@ -22,7 +22,7 @@
>                 </div>
>                 [% UNLESS ( basketcount OR subscriptioncount ) %]
>                     <div class="btn-group">
>-                        <button type="button" data-toggle="modal" data-target="#deleteVendorModal" data-booksellerid="[% booksellerid | html %]" class="btn btn-default"><i class="fa fa-trash-can"></i> Delete vendor</button>
>+                        <button type="button" data-bs-toggle="modal" data-bs-target="#deleteVendorModal" data-booksellerid="[% booksellerid | html %]" class="btn btn-default"><i class="fa fa-trash-can"></i> Delete vendor</button>
>                     </div>
>                 [% END %]
>             [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/modals/delete_vendor.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/modals/delete_vendor.inc
>index be4801b88f..0a1599288a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/modals/delete_vendor.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/modals/delete_vendor.inc
>@@ -7,17 +7,17 @@
>         <div class="modal-dialog" role="document">
>             <div class="modal-content">
>                 <div class="modal-header">
>-                    <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
>                     <h4 class="modal-title" id="deleteVendorModalLabel">Delete vendor</h4>
>+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
>                 </div>
>                 <div class="modal-body">
>                     <p>Are you sure you want to delete this vendor?</p>
>                 </div>
>                 <div class="modal-footer">
>-                    <button id="deleteVendorModaConfirmBtn" class="btn btn-primary"><i class="fa fa-check" aria-hidden="true"></i> Yes</button>
>-                    <button id="deleteVendorModaCancelBtn"data-dismiss="modal" class="btn btn-secondary"><i class="fa fa-times" aria-hidden="true"></i> No</button>
>+                    <button type="submit" id="deleteVendorModaConfirmBtn" class="btn btn-default approve"><i class="fa fa-check" aria-hidden="true"></i> Yes</button>
>+                    <button type="button" id="deleteVendorModaCancelBtn"data-bs-dismiss="modal" class="btn btn-default deny"><i class="fa fa-times" aria-hidden="true"></i> No</button>
>                 </div>
>             </div>
>         </div>
>     </form>
>-</div>
>\ No newline at end of file
>+</div>
>-- 
>2.39.2

Actions: View | Diff | Splinter Review

Attachments on bug 37739: 170751 | 170792 | 170822 | 170823