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

"only add total automatically, if $only_keys === false or show_sums"

Browse Source
This commit is contained in:
Ralf Becker 2009-05-06 08:12:51 +00:00
parent 0923f55a9d
commit 7ba0af7f28
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
timesheet/inc/class.timesheet_bo.inc.php
View File

@ -150,7 +150,7 @@ class timesheet_bo extends so_sql_cf
{ {
if ($grant & $required) if ($grant & $required)
{ {
$result[$uid] = $GLOBALS['egw']->common->grab_owner_name($uid); $result[$uid] = common::grab_owner_name($uid);
} }
} }
natcasesort($result); natcasesort($result);
@ -294,8 +294,10 @@ class timesheet_bo extends so_sql_cf
{ {
$extra_cols = $extra_cols ? explode(',',$extra_cols) : array(); $extra_cols = $extra_cols ? explode(',',$extra_cols) : array();
} }
$extra_cols[] = $total_sql.' AS ts_total'; if ($only_keys === false || $this->show_sums && strpos($order_by,'ts_start') !== false)
{
$extra_cols[] = $total_sql.' AS ts_total';
}
if (!isset($filter['ts_owner']) || !count($filter['ts_owner'])) if (!isset($filter['ts_owner']) || !count($filter['ts_owner']))
{ {
$filter['ts_owner'] = array_keys($this->grants); $filter['ts_owner'] = array_keys($this->grants);