extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-29 03:13:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix double-offset of start date when copying infolog from project template

Browse Source
This commit is contained in:
nathangray 2016-09-20 09:05:46 -06:00
parent a9fbd6094f
commit 059bff61f6
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -129,10 +129,17 @@ class infolog_datasource extends datasource
'real_start' => 'info_startdate', 'real_start' => 'info_startdate',
'real_end' => 'info_datecompleted' 'real_end' => 'info_datecompleted'
); );
$startdate_original = $info['info_startdate'];
foreach($map as $offset_field => $info_field) foreach($map as $offset_field => $info_field)
{ {
if($date_offsets[$offset_field] && $info[$info_field]) if($date_offsets[$offset_field] && $info[$info_field])
{ {
// Don't move startdate twice, but prefer later value
if($startdate_original && $info_field == 'info_startdate')
{
$info[$info_field] = $startdate_original;
}
//error_log($offset_field . ' ' . Api\DateTime::to($info[$info_field]) . ' ' . $date_offsets[$offset_field]->format('%R%a days') . ' ' . date_add(new Api\DateTime($info[$info_field]), $date_offsets[$offset_field]) ); //error_log($offset_field . ' ' . Api\DateTime::to($info[$info_field]) . ' ' . $date_offsets[$offset_field]->format('%R%a days') . ' ' . date_add(new Api\DateTime($info[$info_field]), $date_offsets[$offset_field]) );
$info[$info_field] = date_add(new Api\DateTime($info[$info_field]), $date_offsets[$offset_field])->format('ts'); $info[$info_field] = date_add(new Api\DateTime($info[$info_field]), $date_offsets[$offset_field])->format('ts');