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

Merge branch dev/task-151834 of zentao/zentaopms (#12149)

Browse Source
This commit is contained in:
刘刚
2025-11-04 08:20:36 +08:00
committed by Gitfox
parent 826cbece79 899d3b8cef
commit 885c443dc6
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/config.php
+1 -1
View File
@@ -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');
module/stage/control.php
+6
View File
@@ -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;
module/upgrade/model.php
+1
View File
@@ -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;