diff --git a/config/zentaopms.php b/config/zentaopms.php index 37c078a004..4ef4b2c276 100644 --- a/config/zentaopms.php +++ b/config/zentaopms.php @@ -694,7 +694,7 @@ $config->featureGroup->waterfall = array(); $config->featureGroup->agileplus = array(); $config->featureGroup->waterfallplus = array(); $config->featureGroup->assetlib = array(); -$config->featureGroup->other = array('devops', 'kanban'); +$config->featureGroup->other = array('devops', 'kanban', 'setCode'); $config->bi = new stdclass(); $config->bi->pickerHeight = 150; diff --git a/module/admin/control.php b/module/admin/control.php index bb07a48cd9..8c09fa5551 100755 --- a/module/admin/control.php +++ b/module/admin/control.php @@ -250,24 +250,29 @@ class admin extends control if($_POST) { $data = form::data()->get(); - $closedFeatures = ''; + $closedFeatures = array(); foreach($this->config->featureGroup as $group => $features) { foreach($features as $feature) { $code = $group . ucfirst($feature); - if(empty($data->module[$code])) $closedFeatures .= "{$code},"; + if(empty($data->module[$code])) $closedFeatures[] = $code; } } - $this->setting->setItem('system.common.closedFeatures', rtrim($closedFeatures, ',')); + $this->setting->setItem('system.common.closedFeatures', implode(',', $closedFeatures)); $this->setting->setItem('system.common.global.scoreStatus', zget($data->module, 'myScore', 0)); $this->setting->setItem('system.custom.URAndSR', $this->config->edition == 'ipd' ? 1 : zget($data->module, 'productUR', 0)); + $this->setting->setItem('system.common.setCode', in_array('otherSetCode', $closedFeatures) ? 0 : 1); $this->loadModel('custom')->processMeasrecordCron(); $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'callback' => '$.apps.updateAppsMenu(true);loadCurrentPage();')); } + + $closedFeatures = $this->setting->getItem('owner=system&module=common§ion=&key=closedFeatures'); + if(empty($config->setCode) && strpos(",{$closedFeatures},", ',otherSetCode,') === false) $closedFeatures .= ',otherSetCode'; + $this->view->title = $this->lang->admin->setModuleIndex; - $this->view->closedFeatures = $this->setting->getItem('owner=system&module=common§ion=&key=closedFeatures'); + $this->view->closedFeatures = $closedFeatures; $this->view->useScore = $this->setting->getItem('owner=system&module=common&global&key=scoreStatus'); $this->view->disabledFeatures = $this->setting->getItem('owner=system&module=common§ion=&key=disabledFeatures'); $this->display(); diff --git a/module/admin/lang/de.php b/module/admin/lang/de.php index 074d3bb7df..8687b8c86a 100755 --- a/module/admin/lang/de.php +++ b/module/admin/lang/de.php @@ -120,6 +120,7 @@ $lang->admin->setModule->kanban = 'Kanban'; $lang->admin->setModule->OA = 'OA'; $lang->admin->setModule->deploy = 'Deploy'; $lang->admin->setModule->traincourse = 'Traincourse'; +$lang->admin->setModule->setCode = 'Code'; $lang->admin->safe = new stdclass(); $lang->admin->safe->common = 'Sicherheits-Regeln'; diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php index 5bba4572f7..5252364325 100755 --- a/module/admin/lang/en.php +++ b/module/admin/lang/en.php @@ -120,6 +120,7 @@ $lang->admin->setModule->kanban = 'Kanban'; $lang->admin->setModule->OA = 'OA'; $lang->admin->setModule->deploy = 'Deploy'; $lang->admin->setModule->traincourse = 'Traincourse'; +$lang->admin->setModule->setCode = 'Code'; $lang->admin->safe = new stdclass(); $lang->admin->safe->common = 'Security Policy'; diff --git a/module/admin/lang/fr.php b/module/admin/lang/fr.php index 65ec12825f..eff2bfb5f5 100755 --- a/module/admin/lang/fr.php +++ b/module/admin/lang/fr.php @@ -120,6 +120,7 @@ $lang->admin->setModule->kanban = 'Kanban'; $lang->admin->setModule->OA = 'OA'; $lang->admin->setModule->deploy = 'Deploy'; $lang->admin->setModule->traincourse = 'Traincourse'; +$lang->admin->setModule->setCode = 'Code'; $lang->admin->safe = new stdclass(); $lang->admin->safe->common = 'Politique de sécurité'; diff --git a/module/admin/lang/menu.php b/module/admin/lang/menu.php index 17b264454c..a93f9331a8 100644 --- a/module/admin/lang/menu.php +++ b/module/admin/lang/menu.php @@ -51,7 +51,7 @@ $lang->admin->menuList->system['subMenu']['cron'] = array('link' => "{$la $lang->admin->menuList->system['subMenu']['timezone'] = array('link' => "{$lang->timezone}|custom|timezone|"); $lang->admin->menuList->system['subMenu']['buildindex'] = array('link' => "{$lang->admin->buildIndex}|search|buildindex|"); $lang->admin->menuList->system['subMenu']['tableengine'] = array('link' => "{$lang->admin->tableEngine}|admin|tableengine|"); -if($this->config->db->driver == 'mysql') $lang->admin->menuList->system['subMenu']['backup'] = array('link' => "{$lang->backup->common}|backup|index|"); +if($this->config->db->driver == 'mysql') $lang->admin->menuList->system['subMenu']['backup'] = array('link' => "{$lang->backup->common}|backup|index|"); $lang->admin->menuList->system['menuOrder']['5'] = 'mode'; if($this->config->db->driver == 'mysql') $lang->admin->menuList->system['menuOrder']['10'] = 'backup'; @@ -88,7 +88,6 @@ $lang->admin->menuList->model['tabMenu']['common']['project'] = array('link if(helper::hasFeature('waterfall') or helper::hasFeature('waterfallplus')) $lang->admin->menuList->model['tabMenu']['common']['stage'] = array('link' => "{$lang->stage->type}|stage|settype|", 'subModule' => 'stage'); $lang->admin->menuList->model['tabMenu']['common']['build'] = array('link' => "{$lang->build->common}|custom|required|module=build", 'alias' => 'set', 'exclude' => 'custom'); $lang->admin->menuList->model['tabMenu']['common']['flow'] = array('link' => "{$lang->custom->flow}|custom|flow|", 'divider' => true); -$lang->admin->menuList->model['tabMenu']['common']['code'] = array('link' => "{$lang->code}|custom|code|"); $lang->admin->menuList->model['tabMenu']['common']['percent'] = array('link' => "{$lang->stage->percent}|custom|percent|"); $lang->admin->menuList->model['tabMenu']['common']['hours'] = array('link' => "{$lang->workingHour}|custom|hours|", 'subModule' => 'holiday', 'links' => array('holiday|browse|', 'custom|hours|')); @@ -98,8 +97,7 @@ $lang->admin->menuList->model['tabMenu']['menuOrder']['common']['5'] = 'p if(helper::hasFeature('waterfall') or helper::hasFeature('waterfallplus')) $lang->admin->menuList->model['tabMenu']['menuOrder']['common']['7'] = 'stage'; $lang->admin->menuList->model['tabMenu']['menuOrder']['common']['10'] = 'build'; $lang->admin->menuList->model['tabMenu']['menuOrder']['common']['35'] = 'flow'; -$lang->admin->menuList->model['tabMenu']['menuOrder']['common']['40'] = 'code'; -$lang->admin->menuList->model['tabMenu']['menuOrder']['common']['43'] = 'percent'; +$lang->admin->menuList->model['tabMenu']['menuOrder']['common']['40'] = 'percent'; $lang->admin->menuList->model['tabMenu']['menuOrder']['common']['45'] = 'hours'; if(helper::hasFeature('waterfall')) $lang->admin->menuList->model['tabMenu']['menuOrder']['waterfall']['5'] = 'stage'; if(helper::hasFeature('waterfallplus')) $lang->admin->menuList->model['tabMenu']['menuOrder']['waterfallplus']['5'] = 'stage'; diff --git a/module/admin/lang/zh-cn.php b/module/admin/lang/zh-cn.php index 97b1b4ff5b..65bc3da27a 100755 --- a/module/admin/lang/zh-cn.php +++ b/module/admin/lang/zh-cn.php @@ -120,6 +120,7 @@ $lang->admin->setModule->kanban = '通用看板'; $lang->admin->setModule->OA = '办公'; $lang->admin->setModule->deploy = '运维'; $lang->admin->setModule->traincourse = '学堂'; +$lang->admin->setModule->setCode = '代号'; $lang->admin->safe = new stdclass(); $lang->admin->safe->common = '安全策略'; diff --git a/module/admin/ui/setmodule.html.php b/module/admin/ui/setmodule.html.php index 9af702809f..08ffec99bc 100644 --- a/module/admin/ui/setmodule.html.php +++ b/module/admin/ui/setmodule.html.php @@ -31,14 +31,8 @@ foreach($config->featureGroup as $group => $features) $code = $group. ucfirst($feature); if(strpos(",$disabledFeatures,", ",$code,") !== false) continue; - if($code == 'myScore') - { - $value = $useScore ? 1 : 0; - } - else - { - $value = strpos(",$closedFeatures,", ",$code,") === false ? '1' : '0'; - } + $value = strpos(",$closedFeatures,", ",$code,") === false ? '1' : '0'; + if($code == 'myScore') $value = $useScore ? 1 : 0; $items[] = checkbox (