Bugzilla – Attachment 147948 Details for
Bug 32991
Improve our Dialog component and remove routes for deletion
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 32991: Don't remove all messages when confirm box is closed
Bug-32991-Dont-remove-all-messages-when-confirm-bo.patch (text/plain), 3.25 KB, created by
Agustín Moyano
on 2023-03-08 14:40:15 UTC
(
hide
)
Description:
Bug 32991: Don't remove all messages when confirm box is closed
Filename:
MIME Type:
Creator:
Agustín Moyano
Created:
2023-03-08 14:40:15 UTC
Size:
3.25 KB
patch
obsolete
>From ac745f594e9135def9cc61691126cca60b21f377 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Tue, 28 Feb 2023 11:48:55 +0100 >Subject: [PATCH] Bug 32991: Don't remove all messages when confirm box is > closed >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >If we cancel the confirmation box we should not clear all the messages > >Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> > >Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com> >Signed-off-by: AgustÃn Moyano <agustinmoyano@theke.io> >--- > .../intranet-tmpl/prog/js/vue/components/Dialog.vue | 9 +++++++-- > koha-tmpl/intranet-tmpl/prog/js/vue/stores/main.js | 9 +++++---- > 2 files changed, 12 insertions(+), 6 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 c7b167faf9..bb50be5c8c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Dialog.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Dialog.vue >@@ -21,7 +21,11 @@ > <i class="fa fa-fw fa-check"></i> > <span v-html="confirmation.accept_label"></span> > </button> >- <button id="close_modal" class="deny" @click="removeMessages"> >+ <button >+ id="close_modal" >+ class="deny" >+ @click="removeConfirmationMessages" >+ > > <i class="fa fa-fw fa-remove"></i> > <span v-html="confirmation.cancel_label"></span> > </button> >@@ -52,7 +56,7 @@ export default { > is_submitting, > is_loading, > } = storeToRefs(mainStore) >- const { removeMessages } = mainStore >+ const { removeMessages, removeConfirmationMessages } = mainStore > return { > message, > error, >@@ -62,6 +66,7 @@ export default { > is_submitting, > is_loading, > removeMessages, >+ removeConfirmationMessages, > } > }, > } >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 21e04f69ec..6a3f290032 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/stores/main.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/stores/main.js >@@ -39,12 +39,9 @@ export const useMainStore = defineStore("main", { > if(accept_callback) { > this._accept_callback = async () => { > await accept_callback() >- this.removeMessages() >+ this.removeConfirmationMessages() > } > } >- this._error = null; >- this._warning = null; >- this._message = null; > this._confirmation = confirmation; > this.displayed_already = displayed; /* Is displayed on the current view */ > }, >@@ -58,6 +55,10 @@ export const useMainStore = defineStore("main", { > } > this.displayed_already = true; > }, >+ removeConfirmationMessages(){ >+ this._confirmation = null; >+ this._accept_callback = null; >+ }, > submitting(){ > this._is_submitting = true; > }, >-- >2.25.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
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