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

* adjust for task #73474.

Browse Source
This commit is contained in:
wangyidong
2022-10-27 08:58:11 +08:00
parent 6208970fde
commit 14a17688cd
3 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/model.php
+15 -13
View File
@@ -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)
module/project/model.php
+1 -1
View File
@@ -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)
module/project/view/activate.html.php
+4 -4
View File
@@ -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<wwccss@gmail.com>
* @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 @@
<table class='table table-form'>
<tr style='height:50px;'>
<th class='w-70px'><?php echo $lang->execution->beginAndEnd;?></th>
<td class='muted' colspan='2'>
<div id='sourceTimeBox'><?php echo $project->begin . ' ~ ' . $project->end;?></div>
<td colspan='2'>
<div id='sourceTimeBox' class='muted'><?php echo $project->begin . ' ~ ' . $project->end;?></div>
<div id='readjustTimeBox' class='hide'>
<div class='input-group'>
<?php echo html::input('begin', $newBegin, "class='form-control form-date'")?>
@@ -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')
})
})