extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

W.I.P. VFS Select Widget:

Browse Source 
- Fix actions of SaveToVfs, SaveAttachmentToVfs, SaveAllToVfs in mail
This commit is contained in:
Hadi Nategh 2017-10-12 13:20:23 +02:00
parent 2c721c95b2
commit c4d4ac146a
1 changed files with 36 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
mail/js/app.js
View File

@ -2959,19 +2959,15 @@ app.classes.mail = AppJS.extend(
mailid = this.et2.getArrayMgr("content").getEntry('mail_id'); mailid = this.et2.getArrayMgr("content").getEntry('mail_id');
attgrid = this.et2.getArrayMgr("content").getEntry('mail_displayattachments')[widget.id.replace(/\[saveAsVFS\]/,'')]; attgrid = this.et2.getArrayMgr("content").getEntry('mail_displayattachments')[widget.id.replace(/\[saveAsVFS\]/,'')];
} }
var url = window.egw_webserverUrl+'/index.php?'; var vfs_select = et2_createWidget('vfs-select', {
var width=640; mode: 'saveas',
var height=570; method: 'mail.mail_ui.ajax_vfsSaveAttachment',
var windowName ='mail'; button_label: egw.lang('Save'),
url += 'menuaction=filemanager.filemanager_select.select'; // todo compose for Draft folder dialog_title: "Save attchment",
url += '&mode=saveas'; method_id: mailid+'::'+attgrid.partID+'::'+attgrid.winmailFlag,
url += '&id='+mailid+'::'+attgrid.partID+'::'+attgrid.winmailFlag; name: attgrid.filename
url += '&name='+attgrid.filename; });
url += '&type='+attgrid.type.toLowerCase(); vfs_select.click();
url += '&method=mail.mail_ui.vfsSaveAttachment';
url += '&label='+egw.lang('Save');
url += '&smime_type='+ (attgrid.smime_type?attgrid.smime_type:'');
egw_openWindowCentered(url,windowName,width,height);
}, },
saveAllAttachmentsToVFS: function(tag_info, widget) saveAllAttachmentsToVFS: function(tag_info, widget)
@ -2989,20 +2985,21 @@ app.classes.mail = AppJS.extend(
mailid = this.et2.getArrayMgr("content").getEntry('mail_id'); mailid = this.et2.getArrayMgr("content").getEntry('mail_id');
attgrid = this.et2.getArrayMgr("content").getEntry('mail_displayattachments'); attgrid = this.et2.getArrayMgr("content").getEntry('mail_displayattachments');
} }
var url = window.egw_webserverUrl+'/index.php?';
var width=640; var ids = [];
var height=570;
var windowName ='mail';
url += 'menuaction=filemanager.filemanager_select.select'; // todo compose for Draft folder
url += '&mode=select-dir';
url += '&method=mail.mail_ui.vfsSaveAttachment';
url += '&label='+egw.lang('Save all');
url += '&smime_type='+ (attgrid.smime_type?attgrid.smime_type:'');
for (var i=0;i<attgrid.length;i++) for (var i=0;i<attgrid.length;i++)
{ {
if (attgrid[i] != null) url += '&id['+i+']='+mailid+'::'+attgrid[i].partID+'::'+attgrid[i].winmailFlag+'::'+attgrid[i].filename; if (attgrid[i] != null) ids.push(mailid+'::'+attgrid[i].partID+'::'+attgrid[i].winmailFlag+'::'+attgrid[i].filename);
} }
egw_openWindowCentered(url,windowName,width,height);
var vfs_select = et2_createWidget('vfs-select', {
mode: 'select-dir',
method: 'mail.mail_ui.ajax_vfsSaveAttachment',
button_label: egw.lang('Save all'),
dialog_title: "Save attchments",
method_id: ids.length > 1 ? ids: ids[0]
});
vfs_select.click();
}, },
/** /**
@ -3029,32 +3026,26 @@ app.classes.mail = AppJS.extend(
} }
} }
} }
var url = window.egw_webserverUrl+'/index.php?'; var ids = [], names = [];
url += 'menuaction=filemanager.filemanager_select.select'; // todo compose for Draft folder
url += '&mode='+ (_elems.length>1?'select-dir':'saveas');
url += '&mime=message'+encodeURIComponent('/')+'rfc822';
url += '&method=mail.mail_ui.vfsSaveMessage';
url += '&label='+(_elems.length>1?egw.lang('Save all'):egw.lang('save'));
for (var i in _elems) for (var i in _elems)
{ {
var _id = _elems[i].id; var _id = _elems[i].id;
var dataElem = egw.dataGetUIDdata(_id); var dataElem = egw.dataGetUIDdata(_id);
var subject = dataElem? dataElem.data.subject: _elems[i].subject; var subject = dataElem? dataElem.data.subject: _elems[i].subject;
var filename = subject.replace(/[\f\n\t\v]/g,"_")|| 'unknown'; var filename = subject.replace(/[\f\n\t\v]/g,"_")|| 'unknown';
if (_elems.length>1) ids.push(_id);
{ names.push(encodeURIComponent(filename+'.eml'));
url += '&id['+i+']='+_id;
url += '&name['+i+']='+encodeURIComponent(filename+'.eml');
}
else
{
url += '&id='+_id;
url += '&name='+encodeURIComponent(filename+'.eml');
}
} }
egw.openPopup(url,'680','400','vfs_save_messages', 'filemanager'); var vfs_select = et2_createWidget('vfs-select', {
mode: _elems.length > 1 ? 'select-dir' : 'saveas',
mime: 'message'+encodeURIComponent('/')+'rfc822',
method: 'mail.mail_ui.ajax_vfsSaveMessage',
button_label: _elems.length>1 ? egw.lang('Save all') : egw.lang('save'),
dialog_title: "Save email",
method_id: _elems.length > 1 ? ids: ids[0],
name: _elems.length > 1 ? names : names[0],
});
vfs_select.click();
}, },
/** /**
@ -6003,6 +5994,8 @@ app.classes.mail = AppJS.extend(
}, },
title: egw.lang('Certificate info for email %1', _metadata.email), title: egw.lang('Certificate info for email %1', _metadata.email),
buttons: buttons, buttons: buttons,
minWidth: 500,
minHeight: 500,
value:{content:content}, value:{content:content},
template: egw.webserverUrl+'/mail/templates/default/smimeCertAddToContact.xet?1', template: egw.webserverUrl+'/mail/templates/default/smimeCertAddToContact.xet?1',
resizable: false resizable: false