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

* Code for task #36042.

Browse Source
This commit is contained in:
holan20180123
2021-02-23 15:33:23 +08:00
parent 151760b145
commit 3ca1f79fd2
13 changed files with 196 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/control.php
+32 -16
View File
@@ -1194,14 +1194,24 @@ class project extends control
$this->view->isSprint = false;
$project = $this->project->getById($this->session->PRJ);
if($project->model == 'scrum' && isset($this->config->custom->sprintConcept) and $this->config->custom->sprintConcept == 1)
if($this->config->global->mode == 'new')
{
$this->view->isSprint = true;
if($project->model == 'scrum' && isset($this->config->custom->sprintConcept) and $this->config->custom->sprintConcept == 1)
{
$this->view->isSprint = true;
unset($this->lang->project->endList[62]);
unset($this->lang->project->endList[93]);
unset($this->lang->project->endList[186]);
unset($this->lang->project->endList[365]);
unset($this->lang->project->endList[62]);
unset($this->lang->project->endList[93]);
unset($this->lang->project->endList[186]);
unset($this->lang->project->endList[365]);
}
$this->view->isStage = $project->model == 'waterfall' ? true : false;
$this->view->iconObject = $project->model == 'waterfall' ? 'stage' : 'sprint';
}
else
{
$this->view->isStage = false;
}
$projectID = key($this->projects);
@@ -1226,8 +1236,6 @@ class project extends control
$this->view->copyProjectID = $copyProjectID;
$this->view->branchGroups = $this->loadModel('branch')->getByProducts(array_keys($products));
$this->view->users = $this->loadModel('user')->getPairs('nodeleted|noclosed');
$this->view->isStage = $project->model == 'waterfall' ? true : false;
$this->view->iconObject = $project->model == 'waterfall' ? 'stage' : 'sprint';
$this->display();
}
@@ -1323,15 +1331,24 @@ class project extends control
}
$this->view->isSprint = false;
$PRJData = $this->project->getById($this->session->PRJ);
if($PRJData->model == 'scrum' && isset($this->config->custom->sprintConcept) && $this->config->custom->sprintConcept == 1)
if($this->config->global->mode == 'new')
{
$this->view->isSprint = true;
$PRJData = $this->project->getById($this->session->PRJ);
if($PRJData->model == 'scrum' && isset($this->config->custom->sprintConcept) && $this->config->custom->sprintConcept == 1)
{
$this->view->isSprint = true;
unset($this->lang->project->endList[62]);
unset($this->lang->project->endList[93]);
unset($this->lang->project->endList[186]);
unset($this->lang->project->endList[365]);
unset($this->lang->project->endList[62]);
unset($this->lang->project->endList[93]);
unset($this->lang->project->endList[186]);
unset($this->lang->project->endList[365]);
}
$this->view->isStage = $PRJData->model == 'waterfall' ? true : false;
}
else
{
$this->view->isStage = false;
}
$this->loadModel('user');
@@ -1362,7 +1379,6 @@ class project extends control
$this->view->notRemoveProducts = $notRemoveProducts;
$this->view->productPlans = $productPlans;
$this->view->branchGroups = $this->loadModel('branch')->getByProducts(array_keys($linkedProducts), '', $linkedBranches);
$this->view->isStage = $PRJData->model == 'waterfall' ? true : false;
$this->display();
}