extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-26 01:43:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Mail: Only show attachment placeholder when attachment method isn't regular attach

Browse Source
This commit is contained in:
nathan 2024-07-03 08:59:13 -06:00
parent 4cee859516
commit f60fd1a209
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mail/js/app.js
View File

@ -5089,9 +5089,9 @@ app.classes.mail = AppJS.extend(
(mode == 'share_rw' || mode == 'share_ro') ? 'link' : mode; (mode == 'share_rw' || mode == 'share_ro') ? 'link' : mode;
} }
this.et2.setArrayMgr('content', content); this.et2.setArrayMgr('content', content);
this.addAttachmentPlaceholder();
attachments.set_value({content:content.data.attachments}); attachments.set_value({content:content.data.attachments});
} }
this.addAttachmentPlaceholder();
}, },
/** /**
@ -6286,9 +6286,10 @@ app.classes.mail = AppJS.extend(
{ {
// Add link placeholder box // Add link placeholder box
const email = this.et2.getWidgetById("mail_htmltext"); const email = this.et2.getWidgetById("mail_htmltext");
const attach_type = this.et2.getWidgetById("filemode");
const placeholder = '<fieldset class="attachments mceNonEditable"><legend>Download attachments</legend>' + this.egw.lang('Attachments') + '</fieldset>'; const placeholder = '<fieldset class="attachments mceNonEditable"><legend>Download attachments</legend>' + this.egw.lang('Attachments') + '</fieldset>';
if (email && !email.getValue().includes(placeholder)) if (email && !email.getValue().includes(placeholder) && attach_type.getValue() !== "attach")
{ {
email.editor.execCommand('mceInsertContent', false, placeholder); email.editor.execCommand('mceInsertContent', false, placeholder);
} }