From 614bc1a776de6a572c15b17044831e735c98e25f Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Sun, 9 Feb 2020 20:29:24 +0100
Subject: [PATCH] Debug: new reply/formward buttons only activate the one modal
---
.../apimail/assets/vue/components/MessageComposer.vue | 2 --
.../apimail/assets/vue/components/MessageContent.vue | 8 ++++----
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/apimail/static/apimail/assets/vue/components/MessageComposer.vue b/apimail/static/apimail/assets/vue/components/MessageComposer.vue
index fcc82255a..8eebd9211 100644
--- a/apimail/static/apimail/assets/vue/components/MessageComposer.vue
+++ b/apimail/static/apimail/assets/vue/components/MessageComposer.vue
@@ -415,11 +415,9 @@ export default {
this.form.attachments = this.originalmessage.attachment_files
}
if (this.originalmessage.data.hasOwnProperty("body-html")) {
- console.log('Putting html')
this.form.body_html += (this.$sanitize(this.originalmessage.data["body-html"]))
}
else {
- console.log('Putting plain')
this.form.body_html += (this.$sanitize(this.originalmessage.data["body-plain"]))
}
this.form.body_html += '</blockquote>'
diff --git a/apimail/static/apimail/assets/vue/components/MessageContent.vue b/apimail/static/apimail/assets/vue/components/MessageContent.vue
index ff038725b..eef0eb149 100644
--- a/apimail/static/apimail/assets/vue/components/MessageContent.vue
+++ b/apimail/static/apimail/assets/vue/components/MessageContent.vue
@@ -11,13 +11,13 @@
<ul class="list-inline m-2">
<li class="list-inline-item">
<b-button
- v-b-modal.modal-reply
+ v-b-modal="'modal-reply-' + message.uuid"
variant="primary"
>
Reply
</b-button>
<b-modal
- id="modal-reply"
+ :id="'modal-reply-' + message.uuid"
size="xl"
title="Reply"
hide-header-close
@@ -34,14 +34,14 @@
</li>
<li class="list-inline-item">
<b-button
- v-b-modal.modal-forward
+ v-b-modal="'modal-forward-' + message.uuid"
variant="dark"
text-variant="white"
>
Forward
</b-button>
<b-modal
- id="modal-forward"
+ :id="'modal-forward-' + message.uuid"
size="xl"
title="Forward"
hide-header-close
--
GitLab