fixed some bugs in nextmatch-sort-colums and filters

This commit is contained in:
Ralf Becker 2001-09-26 20:52:57 +00:00
parent 2874ce3a5c
commit 5a799d8801

View File

@ -59,11 +59,11 @@
'none' => lang('no Filter'), 'none' => lang('no Filter'),
'done' => lang('done'), 'done' => lang('done'),
'own' => lang('own'), 'own' => lang('own'),
'own+open+today' => lang('own open'), 'own-open-today' => lang('own open'),
'own+open+overdue'=> lang('own overdue'), 'own-open-overdue'=> lang('own overdue'),
'own+upcoming' => lang('own upcoming'), 'own-upcoming' => lang('own upcoming'),
'open+today' => lang('open'), 'open-today' => lang('open'),
'open+overdue' => lang('overdue'), 'open-overdue' => lang('overdue'),
'upcoming' => lang('upcoming') 'upcoming' => lang('upcoming')
); );
@ -217,12 +217,13 @@
$phpgw_info['user']['preferences']['common']['dateformat']), $phpgw_info['user']['preferences']['common']['dateformat']),
'enddate' => $enddate, 'enddate' => $enddate,
'owner' => $owner, 'owner' => $owner,
'datecreated' => $phpgw->common->show_date($info['info_datecreated'] ,$phpgw_info['user']['preferences']['common']['dateformat']), 'datecreated' => $phpgw->common->show_date($info['info_datecreated'],
$phpgw_info['user']['preferences']['common']['dateformat']),
'responsible' => $responsible 'responsible' => $responsible
); );
} }
function infoHeaders( $do_sort_header=0,$sort=0,$order=0) function infoHeaders( $do_sort_header=0,$sort=0,$order=0,$cat_id=0)
{ {
global $phpgw,$phpgw_info; global $phpgw,$phpgw_info;
@ -242,7 +243,7 @@
while (list($f,$lang) = each($fields)) while (list($f,$lang) = each($fields))
{ {
$lang = lang($lang); $lang = lang($lang);
$headers['lang_'.$f] = $do_sort_header ? $this->nextmatchs->show_sort_order($sort,'info_'.$f,$order,'/index.php',$lang,'&menuaction=infolog.uiinfolog.get_list') : $lang; $headers['lang_'.$f] = $do_sort_header ? $this->nextmatchs->show_sort_order($sort,'info_'.$f,$order,'/index.php',$lang,"&cat_id=$cat_id") : $lang;
} }
return $headers; return $headers;
} }
@ -349,7 +350,7 @@
// =========================================== // ===========================================
// list header variable template-declarations // list header variable template-declarations
// =========================================== // ===========================================
$t->set_var( $this->infoHeaders( !$for_include,$sort,$order )); $t->set_var( $this->infoHeaders( !$for_include,$sort,$order,$cat_id ));
$t->set_var(h_lang_sub,lang('Sub')); $t->set_var(h_lang_sub,lang('Sub'));
$t->set_var(h_lang_action,lang('Action')); $t->set_var(h_lang_action,lang('Action'));
// -------------- end header declaration ----------------- // -------------- end header declaration -----------------