X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/timetracker.git/blobdiff_plain/7562c5b6d68929eb4787749f8c10dc032ee9a1c7..2469578bc42cdad7caf9ca05855726be8e953fbc:/report.php diff --git a/report.php b/report.php index f6abcc4c..1a8ce63c 100644 --- a/report.php +++ b/report.php @@ -54,7 +54,7 @@ if ($user->isPluginEnabled('iv')) { // Use custom fields plugin if it is enabled. if ($user->isPluginEnabled('cf')) { require_once('plugins/CustomFields.class.php'); - $custom_fields = new CustomFields($user->group_id); + $custom_fields = new CustomFields(); $smarty->assign('custom_fields', $custom_fields); } @@ -173,6 +173,8 @@ if ($request->isPost()) { $group_by = $bean->getAttribute('group_by1'); $options = ttReportHelper::getReportOptions($bean); + +$group_by_tag = ttReportHelper::makeGroupByXmlTag($options); $report_items = ttReportHelper::getItems($options); // Store record ids in session in case user wants to act on records such as marking them all paid. if ($request->isGet() && $user->isPluginEnabled('ps')) @@ -201,6 +203,9 @@ if ('no_grouping' != $group_by) { } */ $smarty->assign('group_by_header', ttReportHelper::makeGroupByHeader($options)); } + +$smarty->assign('group_by', $group_by_tag); + // Assign variables that are used to alternate color of rows for different dates. $smarty->assign('prev_date', ''); $smarty->assign('cur_date', '');