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

Don't add parent in expanded children

Browse Source
This commit is contained in:
Nathan Gray 2013-11-07 17:28:49 +00:00
parent 441a0eb4e9
commit de1e14307d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
infolog/inc/class.infolog_ui.inc.php
View File

@ -378,7 +378,8 @@ class infolog_ui
} }
$readonlys = $rows = array(); $readonlys = $rows = array();
if ($query['action_id']) // Don't add parent in if info_id_parent (expanding to show subs)
if ($query['action_id'] && !$query['col_filter']['info_id_parent'])
{ {
$parents = $query['action'] == 'sp' && $query['action_id'] ? (array)$query['action_id'] : array(); $parents = $query['action'] == 'sp' && $query['action_id'] ? (array)$query['action_id'] : array();
if (count($parents) == 1 && is_array($query['action_id'])) if (count($parents) == 1 && is_array($query['action_id']))
@ -403,7 +404,7 @@ class infolog_ui
$info = $this->get_info($info,$readonlys,$query['action'],$query['action_id'],$query['filter2'],$details); $info = $this->get_info($info,$readonlys,$query['action'],$query['action_id'],$query['filter2'],$details);
} }
// for subs view ('sp') add parent(s) in front of subs once(!) // for subs view ('sp') add parent(s) in front of subs once(!)
if ($parent_first && ($main = $this->bo->read($query['action_id'])) || if ( $parent_first && ($main = $this->bo->read($query['action_id'])) ||
$parents && ($parent_index = array_search($info['info_id_parent'], $parents)) !== false && $parents && ($parent_index = array_search($info['info_id_parent'], $parents)) !== false &&
($main = $this->bo->read($info['info_id_parent']))) ($main = $this->bo->read($info['info_id_parent'])))
{ {