holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mail tree phase2 W.I.P.:

Browse Source 
Make sure node id is string because client-side tree expected to be. Fixes context menu not working after refresh tree
This commit is contained in:
Hadi Nategh 2015-08-05 08:37:22 +00:00
parent 535488ca28
commit bee933496d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mail/inc/class.mail_tree.inc.php
View File

@ -271,7 +271,7 @@ class mail_tree
if (self::isAccountNode($_parent)) if (self::isAccountNode($_parent))
{ {
$tree = array( $tree = array(
tree::ID => $_parent, tree::ID => (string)$_parent,
tree::CHILDREN => $tree[tree::CHILDREN][0][tree::CHILDREN], tree::CHILDREN => $tree[tree::CHILDREN][0][tree::CHILDREN],
tree::LABEL => $tree[tree::CHILDREN][0][tree::LABEL], tree::LABEL => $tree[tree::CHILDREN][0][tree::LABEL],
tree::IMAGE_LEAF => $tree[tree::CHILDREN][0][tree::IMAGE_LEAF], tree::IMAGE_LEAF => $tree[tree::CHILDREN][0][tree::IMAGE_LEAF],
@ -279,6 +279,7 @@ class mail_tree
tree::IMAGE_FOLDER_CLOSED => $tree[tree::CHILDREN][0][tree::IMAGE_FOLDER_CLOSED], tree::IMAGE_FOLDER_CLOSED => $tree[tree::CHILDREN][0][tree::IMAGE_FOLDER_CLOSED],
tree::OPEN => 1, tree::OPEN => 1,
tree::TOOLTIP => $tree[tree::CHILDREN][0][tree::TOOLTIP], tree::TOOLTIP => $tree[tree::CHILDREN][0][tree::TOOLTIP],
tree::AUTOLOAD_CHILDREN => 1,
'data' => $tree[tree::CHILDREN][0]['data'] 'data' => $tree[tree::CHILDREN][0]['data']
); );
} }
@ -441,7 +442,7 @@ class mail_tree
$openActiveAccount = $GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'] == $acc_id?1:0; $openActiveAccount = $GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'] == $acc_id?1:0;
$baseNode = array( $baseNode = array(
tree::ID=> $acc_id, tree::ID=> (string)$acc_id,
tree::LABEL => str_replace(array('<','>'),array('[',']'),$identity), tree::LABEL => str_replace(array('<','>'),array('[',']'),$identity),
tree::TOOLTIP => '('.$acc_id.') '.htmlspecialchars_decode($identity), tree::TOOLTIP => '('.$acc_id.') '.htmlspecialchars_decode($identity),
tree::IMAGE_LEAF => self::$leafImages['folderAccount'], tree::IMAGE_LEAF => self::$leafImages['folderAccount'],