When changing the nextmatch row template, don't query the database right away since re-initializing the nextmatch controller forces another query.

This commit is contained in:
Nathan Gray 2015-02-09 20:47:18 +00:00
parent eefbb1a21d
commit 07fc3e4bbf

View File

@ -387,6 +387,7 @@ class infolog_ui
} }
// check if we have a custom, type-specific template // check if we have a custom, type-specific template
$old_template = $query['template'];
$query['template'] = 'infolog.index.rows'; $query['template'] = 'infolog.index.rows';
unset($query['custom_fields']); unset($query['custom_fields']);
if ($query['col_filter']['info_type']) if ($query['col_filter']['info_type'])
@ -404,6 +405,9 @@ class infolog_ui
$query['col_filter']['info_status'] = ''; $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 // 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 // so we have to check that as well
$details = $query['filter2'] == 'all'; $details = $query['filter2'] == 'all';