Attachment 147546 Details for Bug 32991 – Bug 32991: Allow for a confirmation title, message, accept_label and cancel_label in Dialog.vue

[patch] Bug 32991: Allow for a confirmation title, message, accept_label and cancel_label in Dialog.vue

Bug-32991-Allow-for-a-confirmation-title-message-a.patch (text/plain), 2.47 KB, created by Jonathan Druart on 2023-03-01 09:50:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2023-03-01 09:50:16 UTC

Size: 2.47 KB

patch

obsolete

>From 3fc0e4dd8430e9dddcaa2ce292a2347803beca5d Mon Sep 17 00:00:00 2001
>From: Pedro Amorim <pedro.amorim@ptfs-europe.com>
>Date: Mon, 27 Feb 2023 15:09:41 +0000
>Subject: [PATCH] Bug 32991: Allow for a confirmation title, message,
> accept_label and cancel_label in Dialog.vue
>
>Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>---
> koha-tmpl/intranet-tmpl/prog/js/vue/components/Dialog.vue | 7 ++++---
> koha-tmpl/intranet-tmpl/prog/js/vue/stores/main.js        | 2 +-
> 2 files changed, 5 insertions(+), 4 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Dialog.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Dialog.vue
>index 45aa8f4661c..c7b167faf90 100644
>--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Dialog.vue
>+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Dialog.vue
>@@ -10,7 +10,8 @@
>     </div>
>     <div class="modal_centered" v-if="confirmation">
>         <div class="dialog alert confirmation">
>-            <h1 v-html="confirmation"></h1>
>+            <h1 v-html="confirmation.title"></h1>
>+            <p v-html="confirmation.message"></p>
>             <button
>                 v-if="accept_callback"
>                 id="accept_modal"
>@@ -18,11 +19,11 @@
>                 @click="accept_callback"
>             >
>                 <i class="fa fa-fw fa-check"></i>
>-                {{ $__("Accept") }}
>+                <span v-html="confirmation.accept_label"></span>
>             </button>
>             <button id="close_modal" class="deny" @click="removeMessages">
>                 <i class="fa fa-fw fa-remove"></i>
>-                {{ $__("Close") }}
>+                <span v-html="confirmation.cancel_label"></span>
>             </button>
>         </div>
>     </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/stores/main.js b/koha-tmpl/intranet-tmpl/prog/js/vue/stores/main.js
>index 838ac6c9c9c..21e04f69eca 100644
>--- a/koha-tmpl/intranet-tmpl/prog/js/vue/stores/main.js
>+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/stores/main.js
>@@ -35,7 +35,7 @@ export const useMainStore = defineStore("main", {
>             this._confirmation = null;
>             this.displayed_already = displayed; /* Is displayed on the current view */
>         },
>-        setConfirmation(confirmation, accept_callback, displayed = true){
>+        setConfirmationDialog(confirmation, accept_callback, displayed = true){
>             if(accept_callback) {
>                 this._accept_callback = async () => {
>                     await accept_callback()
>-- 
>2.25.1

Actions: View | Diff | Splinter Review

Attachments on bug 32991: 146828 | 146829 | 147051 | 147052 | 147053 | 147054 | 147082 | 147083 | 147281 | 147282 | 147291 | 147305 | 147350 | 147383 | 147384 | 147385 | 147387 | 147388 | 147389 | 147390 | 147391 | 147392 | 147393 | 147394 | 147429 | 147439 | 147445 | 147447 | 147448 | 147449 | 147450 | 147451 | 147452 | 147453 | 147454 | 147455 | 147456 | 147461 | 147483 | 147485 | 147486 | 147487 | 147542 | 147543 | 147544 | 147545 | 147546 | 147547 | 147548 | 147549 | 147550 | 147551 | 147552 | 147553 | 147554 | 147569 | 147573 | 147584 | 147588 | 147589 | 147590 | 147591 | 147592 | 147593 | 147594 | 147595 | 147596 | 147597 | 147598 | 147599 | 147600 | 147601 | 147602 | 147603 | 147604 | 147937 | 147938 | 147939 | 147940 | 147941 | 147942 | 147943 | 147944 | 147945 | 147946 | 147947 | 147948 | 147949 | 147950 | 147951