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

Set is_parent flag for all get_rows calls, not just the onces done via ajax.

Browse Source 
FIxes missing flags on first load.
This commit is contained in:
Nathan Gray 2014-02-05 23:13:47 +00:00
parent 2ece0f771f
commit 378bd43d29
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
etemplate/inc/class.etemplate_widget_nextmatch.inc.php
View File

@ -372,8 +372,6 @@ class etemplate_widget_nextmatch extends etemplate_widget
$row_id = isset($value['row_id']) ? $value['row_id'] : 'id';
$row_modified = $value['row_modified'];
$is_parent = $value['is_parent'];
$is_parent_value = $value['is_parent_value'];
foreach($rows as $n => $row)
{
@ -390,12 +388,6 @@ class etemplate_widget_nextmatch extends etemplate_widget
if (!$row_id || !$knownUids || ($kUkey = array_search($id, $knownUids)) === false ||
!$lastModified || !isset($row[$row_modified]) || $row[$row_modified] > $lastModified)
{
if ($parent_id) // if app supports parent_id / hierarchy, set parent_id and is_parent
{
$row['is_parent'] = isset($is_parent_value) ?
$row[$is_parent] == $is_parent_value : (boolean)$row[$is_parent];
$row['parent_id'] = $row[$parent_id]; // seems NOT used on client!
}
$result['data'][$id] = $row;
}
if ($kUkey !== false) unset($knownUids[$kUkey]);
@ -544,6 +536,9 @@ class etemplate_widget_nextmatch extends etemplate_widget
// otherwise we might get stoped by max_excutiontime
if ($total > 200) @set_time_limit(0);
$is_parent = $value['is_parent'];
$is_parent_value = $value['is_parent_value'];
// remove empty rows required by old etemplate to compensate for header rows
$first = $total ? null : 0;
foreach($raw_rows as $n => $row)
@ -552,6 +547,13 @@ class etemplate_widget_nextmatch extends etemplate_widget
if (is_int($n) && is_array($rows))
{
if (is_null($first)) $first = $n;
if ($row[$is_parent]) // if app supports parent_id / hierarchy, set parent_id and is_parent
{
$row['is_parent'] = isset($is_parent_value) ?
$row[$is_parent] == $is_parent_value : (boolean)$row[$is_parent];
$row['parent_id'] = $row[$parent_id]; // seems NOT used on client!
}
$rows[$n-$first+$value['start']] = $row;
}
elseif(!is_numeric($n)) // rows with string-keys, after numeric rows