mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-24 17:04:14 +01:00
* Timesheet: filtering by a status did not contain timesheets of sub-status
This commit is contained in:
parent
3459a34a9f
commit
b89ac80f6b
@ -217,6 +217,27 @@ class timesheet_bo extends so_sql_cf
|
||||
$this->status_labels_config = $sorted;
|
||||
}
|
||||
|
||||
/**
|
||||
* Return evtl. existing sub-statuses of given status
|
||||
*
|
||||
* @param int $status
|
||||
* @return array|int with sub-statuses incl. $status or just $status
|
||||
*/
|
||||
function get_sub_status($status)
|
||||
{
|
||||
if (!isset($this->status_labels_config)) $this->load_statuses();
|
||||
$stati = array($status);
|
||||
foreach($this->status_labels_config as $stat)
|
||||
{
|
||||
if ($stat['parent'] && in_array($stat['parent'], $stati))
|
||||
{
|
||||
$stati[] = $stat['id'];
|
||||
}
|
||||
}
|
||||
//error_log(__METHOD__."($status) returning ".array2string(count($stati) == 1 ? $status : $stati));
|
||||
return count($stati) == 1 ? $status : $stati;
|
||||
}
|
||||
|
||||
/**
|
||||
* Make nice labels with leading spaces depending on depth
|
||||
*
|
||||
@ -459,6 +480,10 @@ class timesheet_bo extends so_sql_cf
|
||||
}
|
||||
}
|
||||
}
|
||||
if (isset($filter['ts_status']) && $filter['ts_status'])
|
||||
{
|
||||
$filter['ts_status'] = $this->get_sub_status($filter['ts_status']);
|
||||
}
|
||||
if (!count($filter['ts_owner']))
|
||||
{
|
||||
$this->total = 0;
|
||||
|
Loading…
Reference in New Issue
Block a user