extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-21 23:43:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

not setting pe_status from datasource (its ignored now anyway)

Browse Source
This commit is contained in:
Ralf Becker 2018-04-27 18:48:06 +02:00
parent cf4752e8dd
commit d26d779376
3 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
calendar/inc/class.calendar_datasource.inc.php
View File

@ -109,10 +109,6 @@ class calendar_datasource extends datasource
// if we have multiple participants we have to multiply the time by the number of participants to get the total time // if we have multiple participants we have to multiply the time by the number of participants to get the total time
$ds['pe_planned_time'] *= count($ds['pe_resources']); $ds['pe_planned_time'] *= count($ds['pe_resources']);
if($data['deleted'])
{
$ds['pe_status'] = 'deleted';
}
/* /*
// ToDO: this does not change automatically after the event is over, // ToDO: this does not change automatically after the event is over,
// maybe we need a flag for that in egw_pm_elements // maybe we need a flag for that in egw_pm_elements

2
infolog/inc/class.infolog_datasource.inc.php
View File

@ -71,11 +71,9 @@ class infolog_datasource extends datasource
{ {
$data =& $data_id; $data =& $data_id;
} }
$status = null;
return array( return array(
'pe_title' => $this->infolog_bo->link_title($data), 'pe_title' => $this->infolog_bo->link_title($data),
'pe_status' => $data['info_status'],
'pe_completion' => $data['info_percent'], 'pe_completion' => $data['info_percent'],
'pe_planned_start'=> $data['info_startdate'] ? $data['info_startdate'] : null, 'pe_planned_start'=> $data['info_startdate'] ? $data['info_startdate'] : null,
'pe_planned_end' => $data['info_enddate'] ? $data['info_enddate'] : null, 'pe_planned_end' => $data['info_enddate'] ? $data['info_enddate'] : null,

12
timesheet/inc/class.timesheet_datasource.inc.php
View File

@ -54,20 +54,8 @@ class timesheet_datasource extends datasource
{ {
$data =& $data_id; $data =& $data_id;
} }
$status = null;
switch($data['ts_status'])
{
case timesheet_bo::DELETED_STATUS:
$status = 'deleted';
break;
case '':
default:
$status = 'active';
break;
}
$ds = array( $ds = array(
'pe_title' => $GLOBALS['timesheet_bo']->link_title($data), 'pe_title' => $GLOBALS['timesheet_bo']->link_title($data),
'pe_status' => $status,
'pe_real_start' => $data['ts_start'], 'pe_real_start' => $data['ts_start'],
'pe_resources' => array($data['ts_owner']), 'pe_resources' => array($data['ts_owner']),
'pe_details' => $data['ts_description'] ? nl2br($data['ts_description']) : '', 'pe_details' => $data['ts_description'] ? nl2br($data['ts_description']) : '',