diff --git a/module/dev/config.php b/module/dev/config.php index 7e24682bbd..a12815a900 100644 --- a/module/dev/config.php +++ b/module/dev/config.php @@ -241,7 +241,7 @@ $config->dev->postParams['testcase']['create']['expect'] = 'string'; $config->dev->postParams['testcase']['create']['mailto'] = 'string'; $config->dev->postParams['testcase']['create']['keywords'] = 'string'; -$config->dev->navTypes = array('second', 'third', 'feature'); +$config->dev->navTypes = array('second', 'third', 'tag'); $config->disableFeature = array(); if(!helper::hasFeature('waterfall')) $config->disableFeature = array('design', 'stage', 'programplan', 'weekly', 'researchplan', 'researchreport', 'gapanalysis'); diff --git a/module/dev/control.php b/module/dev/control.php index a52d3a6756..9dd8c1c437 100644 --- a/module/dev/control.php +++ b/module/dev/control.php @@ -85,7 +85,7 @@ class dev extends control /** * Custom menu lang item. * - * @param string $type common|first|second|third|feature + * @param string $type common|first|second|third|tag * @param string $module * @param string $method * @param string $language zh_cn|en|fr|de|zh_tw @@ -118,8 +118,8 @@ class dev extends control $moduleName = $module . 'SubMenu'; } - if($type == 'feature' and empty($module)) $module = 'my'; - if($type == 'feature' and empty($method)) $method = 'todo'; + if($type == 'tag' and empty($module)) $module = 'my'; + if($type == 'tag' and empty($method)) $method = 'todo'; if($this->server->request_method == 'POST') { diff --git a/module/dev/lang/de.php b/module/dev/lang/de.php index 1e9843693b..fb484cc2d7 100644 --- a/module/dev/lang/de.php +++ b/module/dev/lang/de.php @@ -193,7 +193,7 @@ $lang->dev->featureBar['langItem']['common'] = 'Common'; $lang->dev->featureBar['langItem']['first'] = 'First Menu'; $lang->dev->featureBar['langItem']['second'] = 'Second Menu'; $lang->dev->featureBar['langItem']['third'] = 'Third Menu'; -$lang->dev->featureBar['langItem']['feature'] = 'Search Tab'; +$lang->dev->featureBar['langItem']['tag'] = 'Search Tag'; $lang->dev->projectMenu['project'] = "{$lang->projectCommon} Common"; $lang->dev->projectMenu['scrum'] = "Scrum {$lang->projectCommon}"; diff --git a/module/dev/lang/en.php b/module/dev/lang/en.php index af7bf8fb21..d385377cdb 100644 --- a/module/dev/lang/en.php +++ b/module/dev/lang/en.php @@ -193,7 +193,7 @@ $lang->dev->featureBar['langItem']['common'] = 'Common'; $lang->dev->featureBar['langItem']['first'] = 'First Menu'; $lang->dev->featureBar['langItem']['second'] = 'Second Menu'; $lang->dev->featureBar['langItem']['third'] = 'Third Menu'; -$lang->dev->featureBar['langItem']['feature'] = 'Search Tab'; +$lang->dev->featureBar['langItem']['tag'] = 'Search Tag'; $lang->dev->projectMenu['project'] = "{$lang->projectCommon} Common"; $lang->dev->projectMenu['scrum'] = "Scrum {$lang->projectCommon}"; diff --git a/module/dev/lang/fr.php b/module/dev/lang/fr.php index af7bf8fb21..d385377cdb 100644 --- a/module/dev/lang/fr.php +++ b/module/dev/lang/fr.php @@ -193,7 +193,7 @@ $lang->dev->featureBar['langItem']['common'] = 'Common'; $lang->dev->featureBar['langItem']['first'] = 'First Menu'; $lang->dev->featureBar['langItem']['second'] = 'Second Menu'; $lang->dev->featureBar['langItem']['third'] = 'Third Menu'; -$lang->dev->featureBar['langItem']['feature'] = 'Search Tab'; +$lang->dev->featureBar['langItem']['tag'] = 'Search Tag'; $lang->dev->projectMenu['project'] = "{$lang->projectCommon} Common"; $lang->dev->projectMenu['scrum'] = "Scrum {$lang->projectCommon}"; diff --git a/module/dev/lang/zh-cn.php b/module/dev/lang/zh-cn.php index cef604e3bf..7929aff2f1 100644 --- a/module/dev/lang/zh-cn.php +++ b/module/dev/lang/zh-cn.php @@ -193,7 +193,7 @@ $lang->dev->featureBar['langItem']['common'] = '公共'; $lang->dev->featureBar['langItem']['first'] = '一级菜单'; $lang->dev->featureBar['langItem']['second'] = '二级菜单'; $lang->dev->featureBar['langItem']['third'] = '三级菜单'; -$lang->dev->featureBar['langItem']['feature'] = '检索标签'; +$lang->dev->featureBar['langItem']['tag'] = '检索标签'; $lang->dev->projectMenu['project'] = "{$lang->projectCommon}通用"; $lang->dev->projectMenu['scrum'] = "敏捷{$lang->projectCommon}"; diff --git a/module/dev/model.php b/module/dev/model.php index d1035d16a2..89a498e65e 100644 --- a/module/dev/model.php +++ b/module/dev/model.php @@ -360,8 +360,8 @@ class devModel extends model if(empty($language)) $language = $this->app->getClientLang(); $originalLangs = array(); $defaultLang = $this->loadDefaultLang($language); - if($type == 'feature' and in_array($module, $this->config->dev->projectMenus)) $module = 'project'; - if($type == 'feature') + if($type == 'tag' and in_array($module, $this->config->dev->projectMenus)) $module = 'project'; + if($type == 'tag') { $this->defaultLang = $defaultLang; $defaultLang = $this->loadDefaultLang($language, $module); @@ -379,7 +379,7 @@ class devModel extends model $originalLangs['SRCommon'] = $this->lang->dev->SR; if(!$this->config->URAndSR) unset($originalLangs['URCommon']); } - elseif($type == 'feature') + elseif($type == 'tag') { $langKey = 'featureBar-' . $method . '_'; $featureBars = zget($defaultLang->$module->featureBar, $method, array()); @@ -465,7 +465,7 @@ class devModel extends model $customeds = $this->loadModel('custom')->getItems("lang={$language}&module={$module}SubMenu§ion=$method&vision={$this->config->vision}"); $langKey = "{$method}_"; break; - case 'feature': + case 'tag': $method = str_replace('_', '-', $method); $customeds = $this->loadModel('custom')->getItems("lang={$language}&module={$module}§ion=featureBar-$method&vision={$this->config->vision}"); $langKey = "featureBar-{$method}_"; @@ -591,7 +591,7 @@ class devModel extends model } /** - * Get feature menus. + * Get tags. * * @param string $menu * @param string $module @@ -599,7 +599,7 @@ class devModel extends model * @access public * @return array */ - public function getFeatureMenus($module, $moduleName = '', $methodName = '') + public function getTagMenus($module, $moduleName = '', $methodName = '') { $menus = array(); foreach(array('homeMenu', 'menu') as $menu) @@ -722,10 +722,10 @@ class devModel extends model $menuItem->children = array(); $childFunc = 'get' . ucfirst($type) . 'Menus'; - if($type == 'feature' and in_array($menuKey, $this->config->dev->projectMenus)) + if($type == 'tag' and in_array($menuKey, $this->config->dev->projectMenus)) { if($menuKey != 'project') continue; - foreach($this->config->dev->projectMenus as $projectModule) $menuItem->children += $this->getFeatureMenus($projectModule, $module, $method); + foreach($this->config->dev->projectMenus as $projectModule) $menuItem->children += $this->getTagMenus($projectModule, $module, $method); } else { @@ -740,7 +740,7 @@ class devModel extends model } /* Unique menu tree by module and method. */ - if($type == 'feature') + if($type == 'tag') { $methods = array(); foreach($menuTree as $index => $menuItem)