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

unset moved / deleted message store to control preview area

Browse Source
This commit is contained in:
Klaus Leithoff 2013-04-30 14:16:52 +00:00
parent 42fd3fe37b
commit 0749b41b29
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mail/inc/class.mail_ui.inc.php
View File

@ -2120,7 +2120,8 @@ blockquote[type=cite] {
function loadEmailBody($_messageID=null) function loadEmailBody($_messageID=null)
{ {
if (!$_messageID) $_messageID = $_GET['_messageID']; if (!$_messageID) $_messageID = $_GET['_messageID'];
if(mail_bo::$debug); error_log(__METHOD__."->".$_flag.':'.print_r($_messageID,true)); if(mail_bo::$debug) error_log(__METHOD__."->".$_flag.':'.print_r($_messageID,true));
if (empty($_messageID)) return "";
$uidA = self::splitRowID($_messageID); $uidA = self::splitRowID($_messageID);
$folder = $uidA['folder']; // all messages in one set are supposed to be within the same folder $folder = $uidA['folder']; // all messages in one set are supposed to be within the same folder
$messageID = $uidA['msgUID']; $messageID = $uidA['msgUID'];

15
mail/js/app.js
View File

@ -64,11 +64,18 @@ app.mail = AppJS.extend(
var _id = selected[0]; var _id = selected[0];
dataElem = egw.dataGetUIDdata(_id); dataElem = egw.dataGetUIDdata(_id);
} }
else if(typeof selected == 'undefined' || selected.length == 0 || typeof dataElem =='undefined')
{ {
var subject ="";
etemplate2.getByApplication('mail')[0].widgetContainer.getWidgetById('previewFromAddress').set_value("");
etemplate2.getByApplication('mail')[0].widgetContainer.getWidgetById('previewToAddress').set_value("");
etemplate2.getByApplication('mail')[0].widgetContainer.getWidgetById('previewDate').set_value("");
etemplate2.getByApplication('mail')[0].widgetContainer.getWidgetById('previewSubject').set_value("");
var IframeHandle = etemplate2.getByApplication('mail')[0].widgetContainer.getWidgetById('messageIFRAME');
IframeHandle.set_src(egw.link('/index.php',{menuaction:'mail.mail_ui.loadEmailBody',_messageID:""}));
return; return;
} }
console.log("mail_preview",dataElem); //console.log("mail_preview",dataElem);
var subject =dataElem.data.subject; var subject =dataElem.data.subject;
etemplate2.getByApplication('mail')[0].widgetContainer.getWidgetById('previewFromAddress').set_value(dataElem.data.fromaddress); etemplate2.getByApplication('mail')[0].widgetContainer.getWidgetById('previewFromAddress').set_value(dataElem.data.fromaddress);
etemplate2.getByApplication('mail')[0].widgetContainer.getWidgetById('previewToAddress').set_value(dataElem.data.toaddress); etemplate2.getByApplication('mail')[0].widgetContainer.getWidgetById('previewToAddress').set_value(dataElem.data.toaddress);
@ -266,6 +273,7 @@ app.mail = AppJS.extend(
this.mail_setRowClass(_elems,'deleted'); this.mail_setRowClass(_elems,'deleted');
var request = new egw_json_request('mail.mail_ui.ajax_deleteMessages',[msg]); var request = new egw_json_request('mail.mail_ui.ajax_deleteMessages',[msg]);
request.sendRequest(false); request.sendRequest(false);
for (var i = 0; i < msg['msg'].length; i++) egw.dataDeleteUID(msg['msg'][i]);
this.mail_refreshMessageGrid(); this.mail_refreshMessageGrid();
}, },
@ -527,7 +535,7 @@ app.mail = AppJS.extend(
messages['msg'] = []; messages['msg'] = [];
} }
for (var i = 0; i < _actionObjects.length; i++) for (var i = 0; i < _actionObjects.length; i++)
{ {
if (_actionObjects[i].id.length>0) if (_actionObjects[i].id.length>0)
{ {
@ -585,6 +593,7 @@ app.mail = AppJS.extend(
// as the "onNodeSelect" function! // as the "onNodeSelect" function!
var request = new egw_json_request('mail.mail_ui.ajax_moveMessages',[target, messages]); var request = new egw_json_request('mail.mail_ui.ajax_moveMessages',[target, messages]);
request.sendRequest(false); request.sendRequest(false);
for (var i = 0; i < messages['msg'].length; i++) egw.dataDeleteUID(messages['msg'][i]);
this.mail_refreshMessageGrid(); this.mail_refreshMessageGrid();
}, },
/** /**