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

Add vacation notice to mail tree context menu

Browse Source
This commit is contained in:
Hadi Nategh 2013-12-17 17:06:44 +00:00
parent bf362a5dce
commit e73e01d71a
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -349,6 +349,13 @@ class mail_ui
'caption' => 'Mail filter',
'icon' => 'configure',
'onExecute' => 'javaScript:app.mail.edit_sieve',
'group' => $group++,
),
'vacation' => array(
'caption' => 'Vacation notice',
'icon' => 'configure',
'onExecute' => 'javaScript:app.mail.edit_vacation',
'group' => $group++,
),
'edit_account' => array(
'caption' => 'Edit account',
@ -366,7 +373,11 @@ class mail_ui
if (!$this->mail_bo->icServer->queryCapability('ACL')) unset($tree_actions['edit_acl']);
$etpl->setElementAttribute(self::$nm_index.'[foldertree]','actions', $tree_actions);
if (!$this->mail_bo->icServer->acc_sieve_enabled) unset($tree_actions['sieve']);
if (!$this->mail_bo->icServer->acc_sieve_enabled)
{
unset($tree_actions['sieve']);
unset($tree_actions['vacation']);
}
$etpl->setElementAttribute(self::$nm_index.'[foldertree]','actions', $tree_actions);
if (empty($content[self::$nm_index]['filter2']) || empty($content[self::$nm_index]['search'])) $content[self::$nm_index]['filter2']='quick';

12
mail/js/app.js
View File

@ -2184,7 +2184,7 @@ app.classes.mail = AppJS.extend(
}
},
sieve_egw_refresh: function(_execid,_msg)
sieve_refresh: function(_execid,_msg)
{
var request = egw().json('mail.mail_sieve.ajax_sieve_egw_refresh', [this.et2_obj.etemplate_exec_id,_msg],null,this.et2_obj,true);
console.log(request);
@ -2252,6 +2252,16 @@ app.classes.mail = AppJS.extend(
{
this.egw.open_link('mail.mail_sieve.index');
},
/**
*
* @todo get the account id and open the relevant vacation, ATM alway open vacation rules which is set in preferences
*/
edit_vacation: function()
{
this.egw.open_link('mail.mail_sieve.editVacation','_blank','700x480');
},
/**
* Edit a folder acl for account(s)
*