extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-26 01:43:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

control target options regarding the move of messages via dragndrop (prefaskformove)

Browse Source
This commit is contained in:
Klaus Leithoff 2014-03-10 13:01:02 +00:00
parent 416c5d3b75
commit 1a07aefd4a
3 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mail/inc/class.mail_hooks.inc.php
View File

@ -425,6 +425,7 @@ class mail_hooks
'name' => 'prefaskformove', 'name' => 'prefaskformove',
'values' => $no_yes_copy, 'values' => $no_yes_copy,
'xmlrpc' => True, 'xmlrpc' => True,
'default'=> 2,
'admin' => False, 'admin' => False,
'forced' => '1', 'forced' => '1',
), ),

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

@ -533,6 +533,25 @@ class mail_ui
'onExecute' => 'javaScript:app.mail.edit_acl', 'onExecute' => 'javaScript:app.mail.edit_acl',
), ),
); );
// the preference prefaskformove controls actually if there is a popup on target or not
// if there are multiple options there is a popup on target, 0 for prefaskformove means
// that only move is available; 1 stands for move and cancel; 2 (should be the default if
// not set); so we are assuming this, when not set
if (isset($this->mail_bo->mailPreferences['prefaskformove']))
{
switch ($this->mail_bo->mailPreferences['prefaskformove'])
{
case 0:
unset($tree_actions['drop_copy_mail']);
unset($tree_actions['drop_cancel']);
break;
case 1:
unset($tree_actions['drop_copy_mail']);
break;
default:
// everything is fine
}
}
//error_log(__METHOD__.__LINE__.' showAllFoldersInFolderPane:'.$this->mail_bo->mailPreferences['showAllFoldersInFolderPane'].'/'.$GLOBALS['egw_info']['user']['preferences']['mail']['showAllFoldersInFolderPane']); //error_log(__METHOD__.__LINE__.' showAllFoldersInFolderPane:'.$this->mail_bo->mailPreferences['showAllFoldersInFolderPane'].'/'.$GLOBALS['egw_info']['user']['preferences']['mail']['showAllFoldersInFolderPane']);
if ($this->mail_bo->mailPreferences['showAllFoldersInFolderPane']) if ($this->mail_bo->mailPreferences['showAllFoldersInFolderPane'])
{ {

1
mail/js/app.js
View File

@ -2088,7 +2088,6 @@ app.classes.mail = AppJS.extend(
*/ */
mail_move: function(_action,_senders,_target) { mail_move: function(_action,_senders,_target) {
//console.log(_action,_senders,_target); //console.log(_action,_senders,_target);
//egw.preference('prefaskformove','mail');
var target = _action.id == 'drop_move_mail' ? _target.iface.id : _action.id.substr(5); var target = _action.id == 'drop_move_mail' ? _target.iface.id : _action.id.substr(5);
var messages = this.mail_getFormData(_senders); var messages = this.mail_getFormData(_senders);
//alert('mail_move('+messages.msg.join(',')+' --> '+target+')'); //alert('mail_move('+messages.msg.join(',')+' --> '+target+')');