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

* InfoLog: fixed subs view to display only selected custom-fields of parent

Browse Source
This commit is contained in:
Ralf Becker 2012-05-08 09:43:22 +00:00
parent 06729148dd
commit c939232fee
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -378,7 +378,7 @@ class infolog_ui
{ {
$query['action_id'] = array_shift($query['action_id']); // display single parent as app_header $query['action_id'] = array_shift($query['action_id']); // display single parent as app_header
} }
// Check to see if we need to remove description // Check to see if we need to remove description
$et = new ReflectionClass('etemplate'); $et = new ReflectionClass('etemplate');
$remove = !($et->isSubclassOf(new ReflectionClass('etemplate_widget'))); $remove = !($et->isSubclassOf(new ReflectionClass('etemplate_widget')));
@ -403,6 +403,22 @@ class infolog_ui
{ {
$main = $this->get_info($main, $readonlys); $main = $this->get_info($main, $readonlys);
$main['class'] .= 'th '; $main['class'] .= 'th ';
// if only certain custom-fields are to be displayed, we need to unset the not displayed ones manually
// as read() always read them all, while search() only reads the selected ones
if ($query['custom_fields'])
{
foreach($columselection as $col)
{
if ($col[0] == '#')
{
foreach($main as $n => $v)
{
if ($n[0] == '#' && !in_array($n, $columselection)) unset($main[$n]);
}
break;
}
}
}
array_splice($rows, $id, 0, array($main)); array_splice($rows, $id, 0, array($main));
unset($parents[$parent_index]); unset($parents[$parent_index]);
} }