backport of r51645: When changing the nextmatch row template, dont query the database right away since re-initializing the nextmatch controller forces another query

This commit is contained in:
Ralf Becker 2015-02-10 08:05:20 +00:00
parent 27395c6adc
commit 871a4eec3a

View File

@ -387,6 +387,7 @@ class infolog_ui
}
// check if we have a custom, type-specific template
$old_template = $query['template'];
$query['template'] = 'infolog.index.rows';
unset($query['custom_fields']);
if ($query['col_filter']['info_type'])
@ -404,6 +405,9 @@ class infolog_ui
$query['col_filter']['info_status'] = '';
}
}
// Template change forces the UI to do a full update first, no point in getting rows right now
if($old_template != $query['template']) return 0;
// do we need to read the custom fields, depends on the column is enabled and customfields exist, prefs are filter specific
// so we have to check that as well
$details = $query['filter2'] == 'all';