From 0d8aba3e69dc7a8002994840ec2f8e6deae722b0 Mon Sep 17 00:00:00 2001 From: nathan Date: Tue, 16 Jul 2024 11:06:50 -0600 Subject: [PATCH] Mail: Fix adding file share via download link into an already open mail does not always work Select options were not right, and sometimes the updated value would be reset by the browser --- mail/js/app.js | 7 ++++--- mail/templates/default/compose.xet | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mail/js/app.js b/mail/js/app.js index f92e5a7bdd..3c159b9d06 100755 --- a/mail/js/app.js +++ b/mail/js/app.js @@ -991,14 +991,15 @@ app.classes.mail = AppJS.extend( if (content[field]['files'] && content[field]['files']['filemode'] && filemode && filemode.get_value() != content[field]['files']['filemode']) { - var filemode_label = filemode.options.select_options.filter(_item => { - return _item.value == content[field]['files']['filemode'] + var filemode_label = filemode.select_options.filter(_item => + { + return _item.value == content[field]['files']['filemode'] })[0]['label']; Et2Dialog.show_dialog(function (_button) { if (_button == Et2Dialog.YES_BUTTON) { - compose_et2[0].widgetContainer._inst.submit(); + compose_et2[0].submit(); } }, this.egw.lang( diff --git a/mail/templates/default/compose.xet b/mail/templates/default/compose.xet index fa083b29cf..a146613c7a 100644 --- a/mail/templates/default/compose.xet +++ b/mail/templates/default/compose.xet @@ -13,7 +13,7 @@ - +