Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* change for task #2533.

Browse Source
This commit is contained in:
wangyidong
2016-04-13 13:51:42 +08:00
parent f8ff737086
commit 75fead9168
6 changed files with 63 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/model.php
+9 -8
View File
@@ -292,6 +292,7 @@ class taskModel extends model
if($data->assignedTos[$taskID] == 'ditto') $data->assignedTos[$taskID] = isset($prev['assignedTo']) ? $prev['assignedTo'] : '';
if($data->pris[$taskID] == 'ditto') $data->pris[$taskID] = isset($prev['pri']) ? $prev['pri'] : 0;
if($data->finishedBys[$taskID] == 'ditto') $data->finishedBys[$taskID] = isset($prev['finishedBy']) ? $prev['finishedBy'] : '';
if($data->canceledBys[$taskID] == 'ditto') $data->canceledBys[$taskID] = isset($prev['canceledBy']) ? $prev['canceledBy'] : '';
if($data->closedBys[$taskID] == 'ditto') $data->closedBys[$taskID] = isset($prev['closedBy']) ? $prev['closedBy'] : '';
$prev['module'] = $data->modules[$taskID];
@@ -300,6 +301,7 @@ class taskModel extends model
$prev['assignedTo'] = $data->assignedTos[$taskID];
$prev['pri'] = $data->pris[$taskID];
$prev['finishedBy'] = $data->finishedBys[$taskID];
$prev['canceledBy'] = $data->canceledBys[$taskID];
$prev['closedBy'] = $data->closedBys[$taskID];
}
@@ -317,20 +319,19 @@ class taskModel extends model
$task->pri = $data->pris[$taskID];
$task->estimate = $data->estimates[$taskID];
$task->left = $data->lefts[$taskID];
$task->estStarted = $data->estStarteds[$taskID];
$task->deadline = $data->deadlines[$taskID];
$task->finishedBy = $data->finishedBys[$taskID];
$task->canceledBy = $oldTask->canceledBy;
$task->canceledBy = $data->canceledBys[$taskID];
$task->closedBy = $data->closedBys[$taskID];
$task->closedReason = $data->closedReasons[$taskID];
$task->finishedDate = $oldTask->finishedDate;
$task->canceledDate = $oldTask->canceledDate;
$task->closedDate = $oldTask->closedDate;
$task->assignedDate = $oldTask->assignedTo ==$task->assignedTo ? $oldTask->assignedDate : $now;
$task->finishedDate = $oldTask->finishedBy == $task->finishedBy ? $oldTask->finishedDate : $now;
$task->canceledDate = $oldTask->canceledBy == $task->canceledBy ? $oldTask->canceledDate : $now;
$task->closedDate = $oldTask->closedBy == $task->closedBy ? $oldTask->closedDate : $now;
$task->lastEditedBy = $this->app->user->account;
$task->lastEditedDate = $now;
$task->consumed = $oldTask->consumed;
if(isset($data->assignedTos[$taskID]))
{
$task->assignedDate = $data->assignedTos[$taskID] == $oldTask->assignedTo ? $oldTask->assignedDate : $now;
}
if($data->consumeds[$taskID])
{