extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-07 16:44:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactored code to always run Nathans fix (before it was only run for ajax requests, not for initial request)

Browse Source
This commit is contained in:
Ralf Becker 2014-10-08 12:16:13 +00:00
parent 76dbe08207
commit fcd03a54c8
1 changed files with 41 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -164,7 +164,7 @@ class etemplate_widget_nextmatch extends etemplate_widget
}
if($value['num_rows'] != 0)
{
$total = self::call_get_rows($send_value, $send_value['rows'], self::$request->readonlys);
$total = self::call_get_rows($send_value, $send_value['rows'], self::$request->readonlys, null, null, $this);
}
if (true) $value =& self::get_array(self::$request->content, $form_name, true);
@ -344,8 +344,7 @@ class etemplate_widget_nextmatch extends etemplate_widget
$value['csv_export'] = 'refresh';
}
$rows = $result['data'] = $result['order'] = array();
// we can NOT run run_beforeSendToClient in call_get_rows, as it would modify row_modified timestamp, which is used below
$result['total'] = self::call_get_rows($value, $rows, $result['readonlys'], null, null, false);
$result['total'] = self::call_get_rows($value, $rows, $result['readonlys'], null, null, $template);
$result['lastModification'] = egw_time::to('now', 'ts')-1;
if (isset($GLOBALS['egw_info']['flags']['app_header']) && self::$request->app_header != $GLOBALS['egw_info']['flags']['app_header'])
@ -356,24 +355,6 @@ class etemplate_widget_nextmatch extends etemplate_widget
$row_id = isset($value['row_id']) ? $value['row_id'] : 'id';
$row_modified = $value['row_modified'];
if($template && $template->attrs['template'])
{
$row_template = $template->getElementById($template->attrs['template']);
if(!$row_template)
{
$row_template = etemplate_widget_template::instance($template->attrs['template']);
}
// Try to find just the repeating part
$repeating_child = null;
// First child should be a grid, we want last row
foreach($row_template->children[0]->children[1]->children as $child)
{
if($child->type == 'row') $repeating_child = $child;
}
$row_template = $repeating_child ? $repeating_child : null;
}
foreach($rows as $n => $row)
{
@ -386,30 +367,20 @@ class etemplate_widget_nextmatch extends etemplate_widget
$id = $row_id ? $row[$row_id] : $n;
$result['order'][] = $id;
$modified = $row[$row_modified];
if (isset($modified) && !(is_int($modified) || is_string($modified) && is_numeric($modified)))
{
$modified = egw_time::to(str_replace('Z', '', $modified), 'ts');
}
// check if we need to send the data
//error_log("$id Known: " . (array_search($id, $knownUids) !== false ? 'Yes' : 'No') . ' Modified: ' . egw_time::to($row[$row_modified]) . ' > ' . egw_time::to($lastModified).'? ' . ($row[$row_modified] > $lastModified ? 'Yes' : 'No'));
if (!$row_id || !$knownUids || ($kUkey = array_search($id, $knownUids)) === false ||
!$lastModified || !isset($row[$row_modified]) || $row[$row_modified] > $lastModified)
!$lastModified || !isset($modified) || $modified > $lastModified)
{
if($row_template)
{
// Change anything by widget for each row ($row set to 1)
$_row = array(1 => &$row);
$row_template->run('set_row_value', array('',array('row' => 1), &$_row), true);
$result['data'][$id] = $row;
}
else if (!$template || get_class($template) != 'etemplate_widget_historylog')
{
// Fallback based on widget names
error_log(self::$request->template['name'] . ' had to fallback to run_beforeSendToClient() because it could not find the row' );
$result['data'][$id] = self::run_beforeSendToClient($row);
}
else
{
$result['data'][$id] = $row;
}
$result['data'][$id] = $row;
}
if ($kUkey !== false) unset($knownUids[$kUkey]);
}
else // non-row data set by get_rows method
@ -564,9 +535,10 @@ class etemplate_widget_nextmatch extends etemplate_widget
* @param array &$readonlys =null
* @param object $obj =null (internal)
* @param string|array $method =null (internal)
* @param etemplate_widget $widget =null instanciated nextmatch widget to let it's widgets transform each row
* @return int|boolean total items found of false on error ($value['get_rows'] not callable)
*/
private static function call_get_rows(array &$value,array &$rows,array &$readonlys=null,$obj=null,$method=null, $run_beforeSendToClient=true)
private static function call_get_rows(array &$value,array &$rows,array &$readonlys=null,$obj=null,$method=null, etemplate_widget $widget=null)
{
if (is_null($method)) $method = $value['get_rows'];
@ -618,13 +590,23 @@ class etemplate_widget_nextmatch extends etemplate_widget
{
$total = false; // method not callable
}
/* no automatic fallback to start=0
if ($method && $total && $value['start'] >= $total)
// if we have a nextmatch widget, find the repeating row
if ($widget && $widget->attrs['template'])
{
$value['start'] = 0;
$total = self::call_get_rows($value,$rows,$readonlys,$obj,$method);
$row_template = $widget->getElementById($widget->attrs['template']);
if(!$row_template)
{
$row_template = etemplate_widget_template::instance($widget->attrs['template']);
}
// Try to find just the repeating part
$repeating_row = null;
// First child should be a grid, we want last row
foreach($row_template->children[0]->children[1]->children as $child)
{
if($child->type == 'row') $repeating_row = $child;
}
}
*/
// otherwise we might get stoped by max_excutiontime
if ($total > 200) @set_time_limit(0);
@ -648,7 +630,19 @@ class etemplate_widget_nextmatch extends etemplate_widget
$row['parent_id'] = $row[$parent_id]; // seems NOT used on client!
}
// run beforeSendToClient methods of widgets in row on row-data
$rows[$n-$first+$value['start']] = $run_beforeSendToClient ? self::run_beforeSendToClient($row) : $row;
if($repeating_row)
{
// Change anything by widget for each row ($row set to 1)
$_row = array(1 => &$row);
$repeating_row->run('set_row_value', array('',array('row' => 1), &$_row), true);
}
else if (!$widget || get_class($widget) != 'etemplate_widget_historylog')
{
// Fallback based on widget names
error_log(self::$request->template['name'] . ' had to fallback to run_beforeSendToClient() because it could not find the row');
$row = self::run_beforeSendToClient($row);
}
$rows[$n-$first+$value['start']] = $row;
}
elseif(!is_numeric($n)) // rows with string-keys, after numeric rows
{