diff --git a/module/execution/control.php b/module/execution/control.php index 44c81b6cd1..3c03258f1d 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -1163,7 +1163,8 @@ class execution extends control /* Get date list. */ $executionInfo = $this->execution->getByID($executionID); - $deadline = strpos('closed,suspended', $execution->status) === false ? helper::today() : ($execution->status == 'closed' ? substr($execution->closedDate, 0, 10) : $execution->suspendedDate); + $deadline = $execution->status == 'closed' ? substr($execution->closedDate, 0, 10) : $execution->suspendedDate; + $deadline = strpos('closed,suspended', $execution->status) === false ? helper::today() : $deadline; $endDate = strpos($type, 'withdelay') !== false ? $deadline : $executionInfo->end; list($dateList, $interval) = $this->execution->getDateList($executionInfo->begin, $endDate, $type, $interval, 'Y-m-d'); $chartData = $this->execution->buildBurnData($executionID, $dateList, $type, $burnBy); diff --git a/module/execution/view/burn.html.php b/module/execution/view/burn.html.php index b1f9af0f86..d84e0a834b 100644 --- a/module/execution/view/burn.html.php +++ b/module/execution/view/burn.html.php @@ -24,7 +24,7 @@ status) === false) + if(strpos('wait,doing', $execution->status) !== false) { common::printLink('execution', 'computeBurn', 'reload=yes', ' ' . $lang->execution->computeBurn, 'hiddenwin', "title='{$lang->execution->computeBurn}' class='btn btn-primary' id='computeBurn'"); echo '
';