holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix server-side of switching info-type specific template "infolog.index.rows.$type" for type $type"

Browse Source
This commit is contained in:
Ralf Becker 2015-02-09 09:03:50 +00:00
parent c28dac7206
commit acebbba931
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
infolog/inc/class.infolog_ui.inc.php
View File

@ -387,7 +387,7 @@ class infolog_ui
} }
// check if we have a custom, type-specific template // check if we have a custom, type-specific template
unset($query['template']); $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'])
{ {
@ -397,7 +397,6 @@ class infolog_ui
$query['template'] = $tpl->name; $query['template'] = $tpl->name;
$query['custom_fields'] = true; // read the custom fields too $query['custom_fields'] = true; // read the custom fields too
} }
//echo "<p align=right>template ='".'infolog.index.rows.'.$query['col_filter']['info_type']."'".(!$query['template'] ? ' not' : '')." found</p>\n";
// If status is not valid for selected type, clear status filter // If status is not valid for selected type, clear status filter
if($query['col_filter']['info_status'] && $query['col_filter']['info_status'] != 'deleted' && if($query['col_filter']['info_status'] && $query['col_filter']['info_status'] != 'deleted' &&
!in_array($query['col_filter']['info_status'], $this->bo->status[$query['col_filter']['info_type']])) !in_array($query['col_filter']['info_status'], $this->bo->status[$query['col_filter']['info_type']]))
@ -408,8 +407,9 @@ class infolog_ui
// 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';
$columnselection_pref = 'nextmatch-'.($query['action'] ? 'infolog.'.$query['action'] : (is_object($query['template']) ? $query['template']->name : 'infolog.index.rows')) $columnselection_pref = 'nextmatch-'.($query['action'] ? 'infolog.'.$query['action'] : ($tpl && $tpl->name == $query['template'] ? $query['template'] : 'infolog.index.rows'))
.($details ? '-details' : ''); .($details ? '-details' : '');
//error_log(__METHOD__."(start=$query[start], num_rows=$query[num_rows]) query[col_filter][info_type]={$query['col_filter']['info_type']} --> query[template]=$query[template], columselection_pref=$columnselection_pref");
$columselection = $this->prefs[$columnselection_pref]; $columselection = $this->prefs[$columnselection_pref];