diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php index ab15213383..853a3c9935 100644 --- a/module/execution/lang/de.php +++ b/module/execution/lang/de.php @@ -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'; diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php index 92e0a46e9e..7bf9c3c25a 100644 --- a/module/execution/lang/en.php +++ b/module/execution/lang/en.php @@ -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'; diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php index 439fdfcb56..becad61f4c 100644 --- a/module/execution/lang/fr.php +++ b/module/execution/lang/fr.php @@ -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'; diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php index 2b8bf04ff8..8b5fb30479 100644 --- a/module/execution/lang/zh-cn.php +++ b/module/execution/lang/zh-cn.php @@ -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'; diff --git a/module/execution/model.php b/module/execution/model.php index d44b041c67..4329446e1f 100755 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -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); diff --git a/module/project/config.php b/module/project/config.php index 234ee42267..78012629e2 100755 --- a/module/project/config.php +++ b/module/project/config.php @@ -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,';