diff --git a/module/project/config.php b/module/project/config.php index ee7852c6c7..16696b9e9e 100755 --- a/module/project/config.php +++ b/module/project/config.php @@ -379,7 +379,7 @@ $config->project->statusLabelList['closed'] = 'closed success-pale'; $config->project->statusLabelList['delay'] = 'delay danger-pale'; $config->project->categoryStages['waterfall'] = array('request', 'design', 'dev', 'qa', 'release', 'review'); -$config->project->categoryStages['IPD'] = array('concept', 'plan', 'develop', 'qualify', 'launch', 'lifecycle'); +$config->project->categoryStages['IPD'] = array('concept', 'plan', 'develop', 'qualify', 'launch'); $config->project->categoryStages['TPD'] = array('concept', 'plan', 'develop', 'qualify'); $config->project->categoryStages['CBB'] = array('concept', 'plan', 'develop', 'qualify'); $config->project->categoryStages['CPD'] = array('plan', 'develop', 'qualify', 'launch'); diff --git a/module/stage/control.php b/module/stage/control.php index 679be0d8ec..4b6cad06f9 100644 --- a/module/stage/control.php +++ b/module/stage/control.php @@ -91,6 +91,8 @@ class stage extends control return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'load' => true)); } + unset($this->lang->stage->ipdTypeList['lifecycle']); + $this->view->title = $this->lang->stage->common . $this->lang->hyphen . $this->lang->stage->create; $this->view->groupID = $groupID; $this->view->flow = $flow; @@ -124,6 +126,8 @@ class stage extends control return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'load' => inlink('browse', "groupID={$groupID}"))); } + unset($this->lang->stage->ipdTypeList['lifecycle']); + $this->view->title = $this->lang->stage->common . $this->lang->hyphen . $this->lang->stage->batchCreate; $this->view->groupID = $groupID; $this->view->flow = $flow; @@ -158,6 +162,8 @@ class stage extends control return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'load' => true)); } + unset($this->lang->stage->ipdTypeList['lifecycle']); + $this->view->title = $this->lang->stage->common . $this->lang->hyphen . $this->lang->stage->edit; $this->view->stage = $stage; $this->view->flow = $flow; diff --git a/module/upgrade/model.php b/module/upgrade/model.php index f6c4b9293a..91e2781e31 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -12612,6 +12612,7 @@ class upgradeModel extends model $flowCode = $flow->code; foreach($stageGroup[$projectModel] as $stage) { + if($stage->type == 'lifecycle') continue; if($flowCode == 'tpdproduct' && !in_array($stage->type, $this->config->project->categoryStages['TPD'])) continue; if($flowCode == 'cbbproduct' && !in_array($stage->type, $this->config->project->categoryStages['CBB'])) continue; if(in_array($flowCode, array('cpdproduct', 'cpdproject')) && !in_array($stage->type, $this->config->project->categoryStages['CPD'])) continue;