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

Show deleted status even when there are no statuses

Browse Source
This commit is contained in:
Nathan Gray 2012-10-22 18:42:02 +00:00
parent 014c720546
commit 7f2962b08e
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
timesheet/inc/class.timesheet_ui.inc.php
View File

@ -309,7 +309,7 @@ class timesheet_ui extends timesheet_bo
'ts_quantity_blur' => $this->data['ts_duration'] ? round($this->data['ts_duration'] / 60.0,3) : '', 'ts_quantity_blur' => $this->data['ts_duration'] ? round($this->data['ts_duration'] / 60.0,3) : '',
'start_time' => egw_time::to($this->data['ts_start'],'H:i'), 'start_time' => egw_time::to($this->data['ts_start'],'H:i'),
'pm_integration' => $this->pm_integration, 'pm_integration' => $this->pm_integration,
'no_ts_status' => !$this->status_labels, 'no_ts_status' => !$this->status_labels && ($this->data['ts_status'] != self::DELETED_STATUS),
)); ));
$links = array(); $links = array();
// create links specified in the REQUEST (URL) // create links specified in the REQUEST (URL)
@ -422,6 +422,10 @@ class timesheet_ui extends timesheet_bo
} }
$sel_options['ts_owner'] = $edit_grants; $sel_options['ts_owner'] = $edit_grants;
$sel_options['ts_status'] = $this->status_labels; $sel_options['ts_status'] = $this->status_labels;
if($this->config_data['history'])
{
$sel_options['ts_status'][self::DELETED_STATUS] = 'Deleted';
}
$GLOBALS['egw_info']['flags']['app_header'] = lang('timesheet').' - '. $GLOBALS['egw_info']['flags']['app_header'] = lang('timesheet').' - '.
($view ? lang('View') : ($this->data['ts_id'] ? lang('Edit') : lang('Add'))); ($view ? lang('View') : ($this->data['ts_id'] ? lang('Edit') : lang('Add')));