Attachment 171651 Details for Bug 37812 – Bug 37812: Fix a modal in the ERM module

[patch] Bug 37812: Fix a modal in the ERM module

Bug-37812-Fix-a-modal-in-the-ERM-module.patch (text/plain), 4.50 KB, created by Jonathan Druart on 2024-09-18 07:23:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2024-09-18 07:23:17 UTC

Size: 4.50 KB

patch

obsolete

>From 040e1933941432b8b189dfae8cbc29caa2227955 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Wed, 18 Sep 2024 08:37:55 +0200
>Subject: [PATCH] Bug 37812: Fix a modal in the ERM module
>
>---
> .../ERM/EHoldingsEBSCOPackageAgreements.vue   | 84 ++++++++++---------
> 1 file changed, 46 insertions(+), 38 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackageAgreements.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackageAgreements.vue
>index 5d239e127cb..108f4cc5ddf 100644
>--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackageAgreements.vue
>+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackageAgreements.vue
>@@ -1,14 +1,42 @@
> <template>
>-    <transition name="modal">
>-        <div v-if="showModal" class="add_agreement_modal">
>-            <AgreementsList :embedded="true" @select-agreement="addAgreement" />
>-            <input
>-                type="button"
>-                @click="showModal = false"
>-                :value="$__('Close')"
>-            />
>+    <div
>+        id="add_agreement"
>+        class="modal"
>+        role="dialog"
>+        aria-labelledby="add_agreement_label"
>+        aria-hidden="true"
>+    >
>+        <div class="modal-dialog modal-xl">
>+            <div class="modal-content modal-xl">
>+                <div class="modal-header">
>+                    <h1 class="modal-title" id="add_agreement_label">
>+                        {{ $__("Add agreement") }}
>+                    </h1>
>+                    <button
>+                        type="button"
>+                        class="btn-close"
>+                        data-bs-dismiss="modal"
>+                        aria-label="Close"
>+                    ></button>
>+                </div>
>+                <div class="modal-body position-relative overflow-visible">
>+                    <AgreementsList
>+                        :embedded="true"
>+                        @select-agreement="addAgreement"
>+                    />
>+                </div>
>+                <div class="modal-footer">
>+                    <button
>+                        class="btn btn-default deny cancel"
>+                        type="button"
>+                        data-bs-dismiss="modal"
>+                    >
>+                        {{ $__("Close") }}
>+                    </button>
>+                </div>
>+            </div>
>         </div>
>-    </transition>
>+    </div>
>     <div id="package_agreements">
>         <div
>             v-for="(
>@@ -33,7 +61,7 @@
>                 ><i class="fa fa-trash"></i
>             ></a>
>         </div>
>-        <a class="btn btn-default btn-xs" @click="showModal = true"
>+        <a class="btn btn-default btn-xs" @click="showAddAgreementModal()"
>             ><font-awesome-icon icon="plus" /> {{ $__("Add new agreement") }}</a
>         >
>     </div>
>@@ -45,9 +73,7 @@ import { APIClient } from "../../fetch/api-client.js"
> import { setWarning, removeMessages } from "../../messages"
> 
> export default {
>-    data() {
>-        return { showModal: false }
>-    },
>+    data() {},
>     beforeCreate() {},
>     methods: {
>         serializeAgreement() {
>@@ -72,9 +98,12 @@ export default {
>             )
>             return erm_package
>         },
>+        showAddAgreementModal() {
>+            $("#add_agreement").modal("show")
>+        },
>         addAgreement(agreement_id) {
>             removeMessages()
>-            this.showModal = false
>+            $("#add_agreement").modal("hide")
>             let erm_package = this.serializeAgreement()
>             // Only add if it does not exist
>             if (
>@@ -135,34 +164,13 @@ export default {
> }
> </script>
> <style>
>-.add_agreement_modal {
>-    position: fixed;
>-    z-index: 9998;
>-    top: 0;
>-    left: 0;
>-    width: 80%;
>-    height: 80%;
>-    background-color: rgba(0, 0, 0, 0.5);
>-    display: table;
>-    transition: opacity 0.3s ease;
>-    margin: auto;
>-    padding: 20px 30px;
>-    background-color: #fff;
>-    border-radius: 2px;
>-    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.33);
>-    transition: all 0.3s ease;
>-    font-family: Helvetica, Arial, sans-serif;
>-}
>-</style>
>-
>-<style>
>-.add_agreement_modal #agreements_list table {
>+#add_agreement #agreements_list table {
>     display: table;
> }
>-.add_agreement_modal .filters label {
>+#add_agreement .filters label {
>     float: none !important;
> }
>-.add_agreement_modal .filters input[type="checkbox"] {
>+#add_agreement .filters input[type="checkbox"] {
>     margin-left: 0 !important;
> }
> </style>
>-- 
>2.34.1

Actions: View | Diff | Splinter Review

Attachments on bug 37812: 170956 | 171252 | 171253 | 171604 | 171605 | 171625 | 171641 | 171651 | 171690 | 171691 | 171692 | 171693 | 171694 | 171695 | 171696 | 171697 | 171702 | 171703 | 171704 | 171705 | 171706 | 171707 | 171708 | 171758 | 171780 | 171781 | 171786