extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-27 09:09:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

* ImportExport/Tracker: timeout left num-rows set to -1, causing nextmatch to try to display full list on next login

Browse Source
This commit is contained in:
Ralf Becker 2012-03-29 10:43:21 +00:00
parent 596a67e285
commit 4d95a9b495
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
etemplate/inc/class.nextmatch_widget.inc.php
View File

@ -301,7 +301,7 @@ class nextmatch_widget
$value['options-num_rows'] =& $row_options; $value['options-num_rows'] =& $row_options;
if (!isset($value['num_rows'])) $extension_data['num_rows'] = $value['num_rows'] = $max; if (!isset($value['num_rows'])) $extension_data['num_rows'] = $value['num_rows'] = $max;
if ($value['num_rows'] != $max) if ($value['num_rows'] != $max || $value['num_rows'] <= 0) // can be -1 if importexport crashes
{ {
$GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'] = $max = (int)$value['num_rows']; $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'] = $max = (int)$value['num_rows'];
} }
@ -1431,7 +1431,6 @@ class nextmatch_widget
if($value_in[self::CF_PREFIX.$name]['id'] != '' && $value_in[self::CF_PREFIX.$name]['id'] != $old_id) { if($value_in[self::CF_PREFIX.$name]['id'] != '' && $value_in[self::CF_PREFIX.$name]['id'] != $old_id) {
$nm_global['filter'][self::CF_PREFIX.$name] = $value_in[self::CF_PREFIX.$name]['id']; $nm_global['filter'][self::CF_PREFIX.$name] = $value_in[self::CF_PREFIX.$name]['id'];
} }
} }
elseif ((string)$value_in[self::CF_PREFIX.$name] != (string)$extension_data['old_value'][self::CF_PREFIX.$name]) elseif ((string)$value_in[self::CF_PREFIX.$name] != (string)$extension_data['old_value'][self::CF_PREFIX.$name])
{ {

1
importexport/inc/class.importexport_definitions_ui.inc.php
View File

@ -298,6 +298,7 @@ class importexport_definitions_ui
@set_time_limit(0); // switch off the execution time limit, as it's for big selections to small @set_time_limit(0); // switch off the execution time limit, as it's for big selections to small
$query['num_rows'] = -1; // all $query['num_rows'] = -1; // all
$query['csv_export'] = true; // so get_rows method _can_ produce different content or not store state in the session
$this->get_rows($query,$rows,$readonlys); $this->get_rows($query,$rows,$readonlys);
$selected = array(); $selected = array();