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

* fix bug #827.

Browse Source
This commit is contained in:
chenfeiCF
2016-04-21 16:35:00 +08:00
parent c64b48ebad
commit ae05ed236d
2 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/control.php
+35 -1
View File
@@ -578,6 +578,23 @@ class task extends control
$this->action->logHistory($actionID, $changes);
$this->sendmail($taskID, $actionID);
}
/* Remind whether to update status of the bug, if task which from that bug has been finished. */
$task = $this->task->getById($taskID);
if($task->fromBug != 0)
{
foreach($changes as $change)
{
if($change['field'] == 'status' and $change['new'] == 'done')
{
$confirmURL = $this->createLink('bug', 'view', "id=$task->fromBug");
unset($_GET['onlybody']);
$cancelURL = $this->createLink('task', 'view', "taskID=$taskID");
die(js::confirm(sprintf($this->lang->task->remindBug, $task->fromBug), $confirmURL, $cancelURL, 'parent', 'parent.parent'));
}
}
}
if(isonlybody()) die(js::closeModal('parent.parent', 'this'));
die(js::locate($this->createLink('task', 'view', "taskID=$taskID"), 'parent'));
}
@@ -601,7 +618,24 @@ class task extends control
if(!empty($_POST))
{
$this->task->recordEstimate($taskID);
$changes = $this->task->recordEstimate($taskID);
/* Remind whether to update status of the bug, if task which from that bug has been finished. */
$task = $this->task->getById($taskID);
if($changes and $task->fromBug != 0)
{
foreach($changes as $change)
{
if($change['field'] == 'status' and $change['new'] == 'done')
{
$confirmURL = $this->createLink('bug', 'view', "id=$task->fromBug");
unset($_GET['onlybody']);
$cancelURL = $this->createLink('task', 'view', "taskID=$taskID");
die(js::confirm(sprintf($this->lang->task->remindBug, $task->fromBug), $confirmURL, $cancelURL, 'parent', 'parent.parent'));
}
}
}
if(isonlybody()) die(js::closeModal('parent.parent', 'this'));
die(js::locate($this->createLink('task', 'view', "taskID=$taskID"), 'parent'));
}
module/task/model.php
+3 -1
View File
@@ -615,9 +615,11 @@ class taskModel extends model
$oldTask->status = $oldStatus;
$newTask->status = $task->status;
$changes = common::createChanges($oldTask, $newTask);
$changes = common::createChanges($oldTask, $newTask);
$this->action->logHistory($actionID, $changes);
if($task->story) $this->loadModel('story')->setStage($task->story);
return $changes;
}
/**