diff --git a/module/custom/config.php b/module/custom/config.php index 7e9ea47aba..9d068042dd 100644 --- a/module/custom/config.php +++ b/module/custom/config.php @@ -1,52 +1,9 @@ custom = new stdClass(); - -$config->custom->story = new stdClass(); -$config->custom->story->fields['priList'] = '优先级'; -$config->custom->story->fields['sourceList'] = '来源'; -$config->custom->story->fields['reasonList'] = '关闭原因'; -$config->custom->story->fields['reviewResultList'] = '评审结果'; -$config->custom->story->fields['stageList'] = '阶段'; -$config->custom->story->fields['statusList'] = '状态'; -$config->custom->story->canAdd = 'reasonList,reviewResultList,sourceList,priList'; - -$config->custom->task = new stdClass(); -$config->custom->task->fields['priList'] = '优先级'; -$config->custom->task->fields['typeList'] = '类型'; -$config->custom->task->fields['reasonList'] = '关闭原因'; -$config->custom->task->fields['statusList'] = '状态'; -$config->custom->task->canAdd = 'priList,typeList'; - -$config->custom->bug = new stdClass(); -$config->custom->bug->fields['priList'] = '优先级'; -$config->custom->bug->fields['severityList'] = '严重程度'; -$config->custom->bug->fields['osList'] = '操作系统'; -$config->custom->bug->fields['browserList'] = '浏览器'; -$config->custom->bug->fields['typeList'] = '类型'; -$config->custom->bug->fields['resolutionList'] = '解决方案'; -$config->custom->bug->fields['statusList'] = '状态'; -$config->custom->bug->canAdd = 'priList,severityList,osList,browserList,typeList,resolutionList'; - -$config->custom->testcase = new stdClass(); -$config->custom->testcase->fields['priList'] = '优先级'; -$config->custom->testcase->fields['typeList'] = '类型'; -$config->custom->testcase->fields['stageList'] = '阶段'; -$config->custom->testcase->fields['resultList'] = '执行结果'; -$config->custom->testcase->fields['statusList'] = '状态'; -$config->custom->testcase->canAdd = 'priList,typeList,stageList'; - -$config->custom->testtask = new stdClass(); -$config->custom->testtask->fields['priList'] = '优先级'; -$config->custom->testtask->fields['statusList'] = '状态'; -$config->custom->testtask->canAdd = 'priList'; - -$config->custom->todo = new stdClass(); -$config->custom->todo->fields['priList'] = '优先级'; -$config->custom->todo->fields['typeList'] = '类型'; -$config->custom->todo->fields['statusList'] = '状态'; -$config->custom->todo->canAdd = 'priList,typeList'; - -$config->custom->user = new stdClass(); -$config->custom->user->fields['roleList'] = '职位'; -$config->custom->user->fields['statusList'] = '状态'; -$config->custom->user->canAdd = 'roleList'; +$config->custom->canAdd['story'] = 'reasonList,reviewResultList,sourceList,priList'; +$config->custom->canAdd['task'] = 'priList,typeList'; +$config->custom->canAdd['bug'] = 'priList,severityList,osList,browserList,typeList,resolutionList'; +$config->custom->canAdd['testcase'] = 'priList,typeList,stageList'; +$config->custom->canAdd['testtask'] = 'priList'; +$config->custom->canAdd['todo'] = 'priList,typeList'; +$config->custom->canAdd['user'] = 'roleList'; diff --git a/module/custom/control.php b/module/custom/control.php index 378c585e1b..870f5a4bf2 100644 --- a/module/custom/control.php +++ b/module/custom/control.php @@ -60,7 +60,7 @@ class custom extends control $this->view->field = $field; $this->view->module = $module; $this->view->currentLang = $currentLang; - $this->view->canAdd = strpos($this->config->custom->$module->canAdd, $field) !== false; + $this->view->canAdd = strpos($this->config->custom->canAdd[$module], $field) !== false; $this->display(); } diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php index 7986930cf0..5454f0cb0f 100644 --- a/module/custom/lang/en.php +++ b/module/custom/lang/en.php @@ -6,13 +6,56 @@ $lang->custom->restore = 'restore'; $lang->custom->key = 'Key'; $lang->custom->value = 'Value'; -$lang->custom->story = 'Story'; -$lang->custom->task = 'Task'; -$lang->custom->bug = 'Bug'; -$lang->custom->testcase = 'Test case'; -$lang->custom->testtask = 'Test task'; -$lang->custom->todo = 'Todo'; -$lang->custom->user = 'User'; +$lang->custom->object['story'] = 'Story'; +$lang->custom->object['task'] = 'Task'; +$lang->custom->object['bug'] = 'Bug'; +$lang->custom->object['testcase'] = 'Test case'; +$lang->custom->object['testtask'] = 'Test task'; +$lang->custom->object['todo'] = 'Todo'; +$lang->custom->object['user'] = 'User'; + +$lang->custom->story = new stdClass(); +$lang->custom->story->fields['priList'] = 'Priority'; +$lang->custom->story->fields['sourceList'] = 'Source'; +$lang->custom->story->fields['reasonList'] = 'Closed reason'; +$lang->custom->story->fields['reviewResultList'] = 'Reviewed result'; +$lang->custom->story->fields['stageList'] = 'Stage'; +$lang->custom->story->fields['statusList'] = 'Status'; + +$lang->custom->task = new stdClass(); +$lang->custom->task->fields['priList'] = 'Priority'; +$lang->custom->task->fields['typeList'] = 'Type'; +$lang->custom->task->fields['reasonList'] = 'Closed reason'; +$lang->custom->task->fields['statusList'] = 'Status'; + +$lang->custom->bug = new stdClass(); +$lang->custom->bug->fields['priList'] = 'Priority'; +$lang->custom->bug->fields['severityList'] = 'Severity'; +$lang->custom->bug->fields['osList'] = 'OS'; +$lang->custom->bug->fields['browserList'] = 'Browser'; +$lang->custom->bug->fields['typeList'] = 'Type'; +$lang->custom->bug->fields['resolutionList'] = 'Resolution'; +$lang->custom->bug->fields['statusList'] = 'Status'; + +$lang->custom->testcase = new stdClass(); +$lang->custom->testcase->fields['priList'] = 'Priority'; +$lang->custom->testcase->fields['typeList'] = 'Type'; +$lang->custom->testcase->fields['stageList'] = 'Stage'; +$lang->custom->testcase->fields['resultList'] = 'Result'; +$lang->custom->testcase->fields['statusList'] = 'Status'; + +$lang->custom->testtask = new stdClass(); +$lang->custom->testtask->fields['priList'] = 'Priority'; +$lang->custom->testtask->fields['statusList'] = 'Status'; + +$lang->custom->todo = new stdClass(); +$lang->custom->todo->fields['priList'] = 'Priority'; +$lang->custom->todo->fields['typeList'] = 'Type'; +$lang->custom->todo->fields['statusList'] = 'Status'; + +$lang->custom->user = new stdClass(); +$lang->custom->user->fields['roleList'] = 'Role'; +$lang->custom->user->fields['statusList'] = 'Status'; $lang->custom->currentLang = 'For current language'; $lang->custom->allLang = 'For all language'; diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php index ddaa4a83b7..65a42665ce 100644 --- a/module/custom/lang/zh-cn.php +++ b/module/custom/lang/zh-cn.php @@ -6,13 +6,56 @@ $lang->custom->restore = '恢复默认'; $lang->custom->key = '键'; $lang->custom->value = '值'; -$lang->custom->story = '需求'; -$lang->custom->task = '任务'; -$lang->custom->bug = 'Bug'; -$lang->custom->testcase = '测试用例'; -$lang->custom->testtask = '测试任务'; -$lang->custom->todo = '待办'; -$lang->custom->user = '用户'; +$lang->custom->object['story'] = '需求'; +$lang->custom->object['task'] = '任务'; +$lang->custom->object['bug'] = 'Bug'; +$lang->custom->object['testcase'] = '测试用例'; +$lang->custom->object['testtask'] = '测试任务'; +$lang->custom->object['todo'] = '待办'; +$lang->custom->object['user'] = '用户'; + +$lang->custom->story = new stdClass(); +$lang->custom->story->fields['priList'] = '优先级'; +$lang->custom->story->fields['sourceList'] = '来源'; +$lang->custom->story->fields['reasonList'] = '关闭原因'; +$lang->custom->story->fields['reviewResultList'] = '评审结果'; +$lang->custom->story->fields['stageList'] = '阶段'; +$lang->custom->story->fields['statusList'] = '状态'; + +$lang->custom->task = new stdClass(); +$lang->custom->task->fields['priList'] = '优先级'; +$lang->custom->task->fields['typeList'] = '类型'; +$lang->custom->task->fields['reasonList'] = '关闭原因'; +$lang->custom->task->fields['statusList'] = '状态'; + +$lang->custom->bug = new stdClass(); +$lang->custom->bug->fields['priList'] = '优先级'; +$lang->custom->bug->fields['severityList'] = '严重程度'; +$lang->custom->bug->fields['osList'] = '操作系统'; +$lang->custom->bug->fields['browserList'] = '浏览器'; +$lang->custom->bug->fields['typeList'] = '类型'; +$lang->custom->bug->fields['resolutionList'] = '解决方案'; +$lang->custom->bug->fields['statusList'] = '状态'; + +$lang->custom->testcase = new stdClass(); +$lang->custom->testcase->fields['priList'] = '优先级'; +$lang->custom->testcase->fields['typeList'] = '类型'; +$lang->custom->testcase->fields['stageList'] = '阶段'; +$lang->custom->testcase->fields['resultList'] = '执行结果'; +$lang->custom->testcase->fields['statusList'] = '状态'; + +$lang->custom->testtask = new stdClass(); +$lang->custom->testtask->fields['priList'] = '优先级'; +$lang->custom->testtask->fields['statusList'] = '状态'; + +$lang->custom->todo = new stdClass(); +$lang->custom->todo->fields['priList'] = '优先级'; +$lang->custom->todo->fields['typeList'] = '类型'; +$lang->custom->todo->fields['statusList'] = '状态'; + +$lang->custom->user = new stdClass(); +$lang->custom->user->fields['roleList'] = '职位'; +$lang->custom->user->fields['statusList'] = '状态'; $lang->custom->currentLang = '适用当前语言'; $lang->custom->allLang = '适用所有语言'; diff --git a/module/custom/view/set.html.php b/module/custom/view/set.html.php index cc1471e65e..dac87d8241 100644 --- a/module/custom/view/set.html.php +++ b/module/custom/view/set.html.php @@ -35,24 +35,23 @@ EOT;
"; common::printLink('custom', 'set', "module=story", $lang->custom->story); echo ''; - echo ""; common::printLink('custom', 'set', "module=task", $lang->custom->task); echo ''; - echo ""; common::printLink('custom', 'set', "module=bug", $lang->custom->bug); echo ''; - echo ""; common::printLink('custom', 'set', "module=testcase", $lang->custom->testcase); echo ''; - echo ""; common::printLink('custom', 'set', "module=testtask", $lang->custom->testtask); echo ''; - echo ""; common::printLink('custom', 'set', "module=todo", $lang->custom->todo); echo '' ; - echo ""; common::printLink('custom', 'set', "module=user", $lang->custom->user); echo ''; + foreach($lang->custom->object as $object => $name) + { + echo ""; + common::printLink('custom', 'set', "module=$object", $name); + echo ''; + } ?>
-
custom->$module?>
+
custom->object[$module]?>
    custom->{$module}->fields as $key => $value) + foreach($lang->custom->{$module}->fields as $key => $value) { echo "
  • " . html::a(inlink('set', "module=$module&field=$key"), $value) . "
  • "; } @@ -64,7 +63,7 @@ EOT;
- +
custom->$module . ' >> ' . $config->custom->$module->fields[$field]?>custom->object[$module] . ' >> ' . $lang->custom->$module->fields[$field]?>
custom->key;?> custom->value;?>