From 0665deed723c3fc153e6dfe2ec39428c9b635ae2 Mon Sep 17 00:00:00 2001 From: guanxiying Date: Fri, 22 Nov 2019 14:45:33 +0800 Subject: [PATCH] * Adjust type and endList of sprint. --- module/project/control.php | 25 +++++++++++++++++++++++++ module/project/view/create.html.php | 3 +++ module/project/view/edit.html.php | 2 ++ 3 files changed, 30 insertions(+) diff --git a/module/project/control.php b/module/project/control.php index 7a63c6193d..2e638e5251 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -1117,6 +1117,18 @@ class project extends control } } + if(strpos($this->config->custom->productProject, '_2')) + { + $this->view->isSprint = true; + unset($this->lang->project->typeList['waterfall']); + unset($this->lang->project->typeList['ops']); + + unset($this->lang->project->endList[62]); + unset($this->lang->project->endList[93]); + unset($this->lang->project->endList[186]); + unset($this->lang->project->endList[365]); + } + $projectID = key($this->projects); if($this->session->project) $projectID = $this->session->project; $this->project->setMenu($this->projects, $projectID); @@ -1206,6 +1218,19 @@ class project extends control $productPlans[$product->id] = $this->productplan->getPairs($product->id); } + if(strpos($this->config->custom->productProject, '_2')) + { + $this->view->isSprint = true; + + unset($this->lang->project->typeList['waterfall']); + unset($this->lang->project->typeList['ops']); + + 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->title = $title; $this->view->position = $position; $this->view->projects = $projects; diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php index fa4d4959d7..c061b48a49 100644 --- a/module/project/view/create.html.php +++ b/module/project/view/create.html.php @@ -77,11 +77,13 @@ project->teamname;?> + project->type;?> project->typeList, '', "class='form-control' onchange='showTypeTips()'");?>
project->typeDesc;?>
+ project->status;?> @@ -154,6 +156,7 @@ + diff --git a/module/project/view/edit.html.php b/module/project/view/edit.html.php index 6f89eba8ba..444196e222 100644 --- a/module/project/view/edit.html.php +++ b/module/project/view/edit.html.php @@ -60,10 +60,12 @@ + project->type;?> project->typeList, $project->type, "class='form-control'");?> + project->teamname;?> team, "class='form-control'");?>