Merge branch dev/task-145754 of zentao/zentaopms (#9918)

This commit is contained in:
刘刚
2025-06-25 15:52:05 +08:00
committed by Gitfox
6 changed files with 5 additions and 9 deletions
-1
View File
@@ -145,7 +145,6 @@ $lang->execution->method = 'Method';
$lang->execution->sameAsParent = "Same as parent";
$lang->execution->selectStoryPlan = 'Select Plan';
$lang->execution->parentStage = 'Parent Stage';
$lang->execution->toTemplate = 'Belonging To Template';
/* Fields of zt_team. */
$lang->execution->root = 'Root';
-1
View File
@@ -145,7 +145,6 @@ $lang->execution->method = 'Method';
$lang->execution->sameAsParent = "Same as parent";
$lang->execution->selectStoryPlan = 'Select Plan';
$lang->execution->parentStage = 'Parent Stage';
$lang->execution->toTemplate = 'Belonging To Template';
/* Fields of zt_team. */
$lang->execution->root = 'Root';
-1
View File
@@ -145,7 +145,6 @@ $lang->execution->method = 'Method';
$lang->execution->sameAsParent = "Same as parent";
$lang->execution->selectStoryPlan = 'Select Plan';
$lang->execution->parentStage = 'Parent Stage';
$lang->execution->toTemplate = 'Belonging To Template';
/* Fields of zt_team. */
$lang->execution->root = 'Root';
-1
View File
@@ -145,7 +145,6 @@ $lang->execution->method = '管理方法';
$lang->execution->sameAsParent = "同父阶段";
$lang->execution->selectStoryPlan = '选择计划';
$lang->execution->parentStage = '所属父阶段';
$lang->execution->toTemplate = '从属于项目模板';
/* Fields of zt_team. */
$lang->execution->root = '源ID';
+2 -2
View File
@@ -148,8 +148,8 @@ class executionModel extends model
if(!empty($execution->isTpl))
{
dao::$filterTpl = 'never';
$this->lang->execution->common = $this->lang->execution->toTemplate;
if(empty($execution->multiple)) $this->lang->project->common = $this->lang->project->template;
$this->lang->execution->common = $this->lang->execution->template;
if(empty($execution->multiple)) $this->lang->project->common = $this->lang->execution->template;
unset($this->lang->execution->menu->burn);
unset($this->lang->execution->menu->kanban);
+3 -3
View File
@@ -36,10 +36,10 @@ $config->project->sortFields->status = 'status';
$config->project->sortFields->budget = 'budget';
$config->project->labelClass['scrum'] = 'secondary-outline';
$config->project->labelClass['waterfall'] = 'warning-outline';
$config->project->labelClass['kanban'] = 'special-outline';
$config->project->labelClass['waterfall'] = 'secondary-outline';
$config->project->labelClass['kanban'] = 'secondary-outline';
$config->project->labelClass['agileplus'] = 'secondary-outline';
$config->project->labelClass['waterfallplus'] = 'warning-outline';
$config->project->labelClass['waterfallplus'] = 'secondary-outline';
$config->project->multiple['project'] = ',qa,devops,doc,build,release,dynamic,settings,';
$config->project->multiple['execution'] = ',task,kanban,burn,view,story,CFD,';