diff --git a/module/execution/model.php b/module/execution/model.php index 9430b98f7b..3ab434dc60 100644 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -5078,19 +5078,21 @@ class executionModel extends model $post = $_POST; $_POST = array(); - $_POST['project'] = $projectID; - $_POST['name'] = $project->name; - $_POST['code'] = $project->code; - $_POST['begin'] = $project->begin; - $_POST['end'] = $project->end; - $_POST['days'] = $project->days; - $_POST['team'] = $project->team; - $_POST['PO'] = $project->PO; - $_POST['QD'] = $project->QD; - $_POST['PM'] = $project->PM; - $_POST['RD'] = $project->RD; - $_POST['status'] = $project->status; - $_POST['acl'] = 'open'; + $_POST['project'] = $projectID; + $_POST['name'] = $project->name; + $_POST['code'] = $project->code; + $_POST['begin'] = $project->begin; + $_POST['end'] = $project->end; + $_POST['realBegan'] = $project->realBegan; + $_POST['realEnd'] = $project->realEnd; + $_POST['days'] = $project->days; + $_POST['team'] = $project->team; + $_POST['PO'] = $project->PO; + $_POST['QD'] = $project->QD; + $_POST['PM'] = $project->PM; + $_POST['RD'] = $project->RD; + $_POST['status'] = $project->status; + $_POST['acl'] = 'open'; $projectProducts = $this->dao->select('*')->from(TABLE_PROJECTPRODUCT)->where('project')->eq($projectID)->fetchAll(); foreach($projectProducts as $projectProduct) diff --git a/module/project/model.php b/module/project/model.php index 4ab4dd6210..03f0a01ee1 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -1864,7 +1864,7 @@ class projectModel extends model if(dao::isError()) return false; - if(!$oldProject->multiple) $this->changeExecutionStatus($projectID, 'activate'); + if(empty($oldProject->multiple) and $oldProject->model != 'waterfall') $this->loadModel('execution')->syncNoMultipleSprint($projectID); /* Readjust task. */ if($this->post->readjustTime and $this->post->readjustTask) diff --git a/module/project/view/activate.html.php b/module/project/view/activate.html.php index 1cced9f528..af8ff70209 100644 --- a/module/project/view/activate.html.php +++ b/module/project/view/activate.html.php @@ -5,7 +5,7 @@ * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) * @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html) * @author Chunsheng Wang - * @package project + * @package project * @version $Id: suspend.html.php 935 2013-01-16 07:49:24Z wwccss@gmail.com $ * @link http://www.zentao.net */ @@ -28,8 +28,8 @@ -
execution->beginAndEnd;?> -
begin . ' ~ ' . $project->end;?>
+
+
begin . ' ~ ' . $project->end;?>
@@ -72,7 +72,7 @@ $(function() $('#readjustTime').change(function() { $('#sourceTimeBox').toggle(!$(this).prop('checked')) - $('#readjustTimeBox').toggle($(this).prop('checked')) + $('#readjustTimeBox').toggleClass('hide', !$(this).prop('checked')) $('#readjustTaskBox').toggleClass('hidden') }) })