From b57562e99e5ac352c9cd38778c57636946589d0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B9=BF=E6=98=8E?= Date: Tue, 11 Jan 2022 00:35:04 +0000 Subject: [PATCH] Revert "Merge branch 'sprint/182_hufangzhou_47331' into 'master'" This reverts merge request !1326 --- module/common/model.php | 2 +- module/project/lang/en.php | 1 - module/project/lang/zh-cn.php | 1 - module/project/model.php | 2 +- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/module/common/model.php b/module/common/model.php index 814602a66d..fe1993ad7a 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -528,7 +528,7 @@ class commonModel extends model $attr = "class='iframe' data-width='650px'"; break; case 'project': - if(!defined('TUTORIAL')) + if(isset($config->maxVersion) and!defined('TUTORIAL')) { $params = "programID=0©ProjectID=0&extra=from=global"; $createMethod = 'createGuide'; diff --git a/module/project/lang/en.php b/module/project/lang/en.php index 382bd8d68e..0ca8910c8c 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -221,7 +221,6 @@ $lang->project->currencySymbol['SGD'] = 'S$'; $lang->project->modelList['scrum'] = "Scrum"; $lang->project->modelList['waterfall'] = "CMMI"; -$lang->project->modelList['kanban'] = "Kanban"; $lang->project->featureBar['all'] = 'All'; $lang->project->featureBar['doing'] = 'Going'; diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index 4e827aa38a..52bcb6ed65 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -221,7 +221,6 @@ $lang->project->currencySymbol['SGD'] = 'S$'; $lang->project->modelList['scrum'] = "Scrum"; $lang->project->modelList['waterfall'] = "瀑布"; -$lang->project->modelList['kanban'] = "看板"; $lang->project->featureBar['all'] = '所有'; $lang->project->featureBar['doing'] = '进行中'; diff --git a/module/project/model.php b/module/project/model.php index 1633a24e75..c01a4e8c2c 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -632,7 +632,7 @@ class projectModel extends model /** * Get project pairs by model and project. * - * @param string $model all|scrum|waterfall|kanban + * @param string $model all|scrum|waterfall * @param int $programID * @access public * @return array