extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-26 16:48:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix send mail to business or private mail from addressbook mail context menu

Browse Source
This commit is contained in:
Hadi Nategh 2014-01-13 17:40:36 +00:00
parent 9dcc4cc00a
commit 0c2ab2ada5
2 changed files with 47 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
addressbook/inc/class.addressbook_ui.inc.php
View File

@ -557,27 +557,37 @@ class addressbook_ui extends addressbook_bo
'icon' => 'mail/navbar', 'icon' => 'mail/navbar',
'group' => $group, 'group' => $group,
'children' => array( 'children' => array(
'add_to_cc' => array( 'add_to_to' => array(
'caption' => lang('Add to %1',lang('CC')), 'caption' => lang('Add to %1',lang('To')),
'no_lang' => true, 'no_lang' => true,
'checkbox' => true, 'onExecute' => 'javaScript:app.addressbook.addEmail',
'group' => $group,
),
'add_to_cc' => array(
'caption' => lang('Add to %1',lang('Cc')),
'no_lang' => true,
'onExecute' => 'javaScript:app.addressbook.addEmail',
), ),
'add_to_bcc' => array( 'add_to_bcc' => array(
'caption' => lang('Add to %1',lang('BCC')), 'caption' => lang('Add to %1',lang('BCc')),
'no_lang' => true, 'no_lang' => true,
'checkbox' => true, 'onExecute' => 'javaScript:app.addressbook.addEmail',
'group' => $group,
), ),
'email_business' => array( 'email_business' => array(
'caption' => lang('Add %1',lang('business email')), 'caption' => lang('Add %1',lang('business email')),
'no_lang' => true, 'no_lang' => true,
'onExecute' => 'javaScript:app.addressbook.addEmail', 'checkbox' => true,
'group' => $group,
'onExecute' => 'javaScript:app.addressbook.mailCheckMenu',
), ),
'email_home' => array( 'email_home' => array(
'caption' => lang('Add %1',lang('home email')), 'caption' => lang('Add %1',lang('home email')),
'no_lang' => true, 'no_lang' => true,
'onExecute' => 'javaScript:app.addressbook.addEmail', 'checkbox' => true,
'group' => $group,
'onExecute' => 'javaScript:app.addressbook.mailCheckMenu',
), ),
), ),

40
addressbook/js/app.js
View File

@ -413,6 +413,15 @@ app.classes.addressbook = AppJS.extend(
return false; return false;
}, },
/**
*
*
*/
mailCheckMenu: function(action, selected)
{
},
/** /**
* Action function to add the email address (business or home) of the selected * Action function to add the email address (business or home) of the selected
* contacts to a compose email popup window. * contacts to a compose email popup window.
@ -427,29 +436,36 @@ app.classes.addressbook = AppJS.extend(
{ {
// Go through selected & pull email addresses from data // Go through selected & pull email addresses from data
var emails = []; var emails = [];
var cc ='', bcc ='';
for(var i = 0; i < selected.length; i++) for(var i = 0; i < selected.length; i++)
{ {
// Pull data from global cache // Pull data from global cache
var data = egw.dataGetUIDdata(selected[i].id) || {data:{}}; var data = egw.dataGetUIDdata(selected[i].id) || {data:{}};
var email = data.data[action.id == 'email_business' ? 'email' : 'email_home'] || '';
var email_business = data.data[action.parent.children[3].checked ? 'email_business' : ''];
var email = data.data[action.parent.children[4].checked ? 'email' : ''];
if(email_business)
{
emails.push(email_business);
}
if(email) if(email)
{ {
emails.push(email); emails.push(email);
} }
} }
// Add to Cc switch (action.id)
if (action.parent.children[0].checked)
{ {
cc = '&cc=' + emails.join(','); case "add_to_to":
egw.open_link('mailto:' + emails.join(','));
break;
case "add_to_cc":
egw.open_link('mailto:' + '?cc=' + emails.join(','));
//egw.mailto('mailto:');
break;
case "add_to_bcc":
egw.open_link('mailto:' + '?bcc=' + emails.join(','));
break;
} }
// Add to Bcc
if (action.parent.children[1].checked)
{
bcc = '&bcc=' + emails.join(',');
}
// Always open a compose, even if no emails, so user knows it worked
egw.open_link('mailto:' + emails.join(',') + cc + bcc );
return false; return false;
}, },