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

* Fix bug #12272.

Browse Source
This commit is contained in:
tianshujie98
2021-04-22 11:38:54 +08:00
parent 89ec9cec9c
commit 64406fe023
6 changed files with 20 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+5 -24
View File
@@ -1231,12 +1231,6 @@ class execution extends control
}
}
$project = $this->project->getByID($projectID);
if(!empty($project->model) and $project->model == 'waterfall')
{
$this->lang->execution->afterInfo = str_replace($this->lang->executionCommon, $this->lang->project->stage, $this->lang->execution->afterInfo);
}
$this->view->title = $this->lang->execution->tips;
$this->view->tips = $this->fetch('execution', 'tips', "executionID=$executionID");
$this->view->executionID = $executionID;
@@ -1317,6 +1311,11 @@ class execution extends control
}
}
if(!empty($project->model) and $project->model == 'waterfall')
{
$this->lang->execution->type = str_replace($this->lang->executionCommon, $this->lang->project->stage, $this->lang->execution->type);
}
$this->view->title = (($this->app->openApp == 'execution') and ($this->config->systemMode == 'new')) ? $this->lang->execution->createExec : $this->lang->execution->create;
$this->view->position[] = $this->view->title;
$this->view->executions = array('' => '') + $this->execution->getList($projectID);
@@ -1433,23 +1432,6 @@ class execution extends control
$productPlans[$product->id] = $this->productplan->getPairs($product->id);
}
$isSprint = true;
if($this->config->systemMode == 'new')
{
$project = $this->project->getById($execution->project);
if($project->model == 'scrum')
{
unset($this->lang->execution->endList[62]);
unset($this->lang->execution->endList[93]);
unset($this->lang->execution->endList[186]);
unset($this->lang->execution->endList[365]);
}
else
{
$isSprint = false;
}
}
$this->loadModel('user');
$poUsers = $this->user->getPairs('noclosed|nodeleted|pofirst', $execution->PO, $this->config->maxCount);
if(!empty($this->config->user->moreLink)) $this->config->moreLinks["PM"] = $this->config->user->moreLink;
@@ -1478,7 +1460,6 @@ class execution extends control
$this->view->unmodifiableProducts = $unmodifiableProducts;
$this->view->productPlans = $productPlans;
$this->view->branchGroups = $this->loadModel('branch')->getByProducts(array_keys($linkedProducts), '', $linkedBranches);
$this->view->isSprint = $isSprint;
$this->display();
}