extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-08-15 02:42:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Mail/Admin: Fix upload picture into mail signature from editor image browser does not work.

Browse Source
This commit is contained in:
Hadi Nategh
2017-12-06 16:25:31 +01:00
parent 500674bf3a
commit 594bd63181
3 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
api/js/etemplate/et2_widget_htmlarea.js
View File

@ -318,7 +318,20 @@ jQuery.extend(et2_htmlarea,
buildVfsSelectForCKEditor: function(_data)
{
if (!_data) return;
var et2 = app[egw(window).app_name()].et2;
// Don't rely only on app_name to fetch et2 object as app_name may not
// always represent current app of the window, e.g.: mail admin account.
// Try to fetch et2 from its template name.
var etemplate = jQuery('form').data('etemplate');
var et2 = {};
if (etemplate && etemplate.name && !app[egw(window).app_name()])
{
et2 = etemplate2.getByTemplate(etemplate.name)[0]['widgetContainer'];
}
else
{
et2 = app[egw(window).app_name()].et2;
}
var vfsSelect = et2_createWidget('vfs-select', {
id:'upload',