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

* fix bug #27262.

Browse Source
This commit is contained in:
wangyidong
2022-09-05 11:30:25 +08:00
parent bd80adb658
commit 86ebfc0480
7 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/control.php
+14 -4
View File
@@ -1227,20 +1227,30 @@ class task extends control
*/
public function deleteEstimate($estimateID, $confirm = 'no')
{
if($confirm == 'no')
$estimate = $this->task->getEstimateById($estimateID);
$task = $this->task->getById($estimate->task);
if($confirm == 'no' and $task->consumed - $estimate->consumed != 0)
{
return print(js::confirm($this->lang->task->confirmDeleteEstimate, $this->createLink('task', 'deleteEstimate', "estimateID=$estimateID&confirm=yes")));
}
elseif($confirm == 'no' and $task->consumed - $estimate->consumed == 0)
{
return print(js::confirm($this->lang->task->confirmDeleteLastEstimate, $this->createLink('task', 'deleteEstimate', "estimateID=$estimateID&confirm=yes")));
}
else
{
$estimate = $this->task->getEstimateById($estimateID);
$task = $this->task->getById($estimate->task);
$changes = $this->task->deleteEstimate($estimateID);
$changes = $this->task->deleteEstimate($estimateID);
if(dao::isError()) return print(js::error(dao::getError()));
$actionID = $this->loadModel('action')->create('task', $estimate->task, 'DeleteEstimate');
$this->action->logHistory($actionID, $changes);
if($task->consumed - $estimate->consumed == 0)
{
$this->loadModel('action')->create('task', $estimate->task, 'Adjusttasktowait');
return print(js::reload('parent.parent'));
}
return print(js::reload('parent'));
}
}