diff --git a/module/custom/control.php b/module/custom/control.php index 1dd03ff30b..ee8af74abe 100644 --- a/module/custom/control.php +++ b/module/custom/control.php @@ -277,11 +277,13 @@ class custom extends control { if($_POST) { - $this->loadModel('setting')->setItem('system.common.global.score', $this->post->score); + $this->loadModel('setting')->setItem('system.common.global.scoreStatus', $this->post->score); die(js::reload('parent')); } - $this->view->title = $this->lang->custom->score; + $this->view->title = $this->lang->custom->score; + $this->view->position[] = $this->lang->custom->common; + $this->view->position[] = $this->view->title; $this->display(); } diff --git a/module/my/control.php b/module/my/control.php index c7710775ca..b50db17dce 100644 --- a/module/my/control.php +++ b/module/my/control.php @@ -53,10 +53,11 @@ class my extends control $pager = new pager($recTotal, $recPerPage, $pageID); $scores = $this->loadModel('score')->getListByAccount($this->app->user->account, $pager); - $this->view->title = $this->lang->score->common; - $this->view->user = $this->loadModel('user')->getById($this->app->user->account); - $this->view->pager = $pager; - $this->view->scores = $scores; + $this->view->title = $this->lang->score->common; + $this->view->user = $this->loadModel('user')->getById($this->app->user->account); + $this->view->pager = $pager; + $this->view->scores = $scores; + $this->view->position[] = $this->lang->score->record; $this->display(); } diff --git a/module/score/control.php b/module/score/control.php index 45fba491f8..45d0c72c49 100644 --- a/module/score/control.php +++ b/module/score/control.php @@ -33,8 +33,9 @@ class score extends control { $this->loadModel('my')->setMenu(); - $this->view->title = $this->lang->my->scoreRule; - $this->view->rule = $this->config->score; + $this->view->title = $this->lang->my->scoreRule; + $this->view->rule = $this->config->score; + $this->view->position[] = $this->lang->my->scoreRule; $this->display(); } diff --git a/module/score/lang/en.php b/module/score/lang/en.php index 0e83a64511..b579b58de4 100644 --- a/module/score/lang/en.php +++ b/module/score/lang/en.php @@ -24,22 +24,22 @@ $lang->score->noLimit = 'No limited'; $lang->score->times = 'Times'; $lang->score->hour = 'Hour'; -$lang->score->models['task'] = 'Task'; -$lang->score->models['tutorial'] = 'Tutorial'; -$lang->score->models['user'] = 'User'; -$lang->score->models['ajax'] = 'Other'; -$lang->score->models['doc'] = 'Doc'; -$lang->score->models['todo'] = 'Todo'; -$lang->score->models['story'] = 'Story'; -$lang->score->models['bug'] = 'Bug'; -$lang->score->models['testcase'] = 'TestCase'; -$lang->score->models['testtask'] = 'TestTask'; -$lang->score->models['build'] = 'Build'; -$lang->score->models['project'] = 'Project'; -$lang->score->models['productplan'] = 'Plan'; -$lang->score->models['release'] = 'Release'; -$lang->score->models['block'] = 'Block'; -$lang->score->models['search'] = 'Search'; +$lang->score->module['task'] = 'Task'; +$lang->score->module['tutorial'] = 'Tutorial'; +$lang->score->module['user'] = 'User'; +$lang->score->module['ajax'] = 'Other'; +$lang->score->module['doc'] = 'Doc'; +$lang->score->module['todo'] = 'Todo'; +$lang->score->module['story'] = 'Story'; +$lang->score->module['bug'] = 'Bug'; +$lang->score->module['testcase'] = 'TestCase'; +$lang->score->module['testtask'] = 'TestTask'; +$lang->score->module['build'] = 'Build'; +$lang->score->module['project'] = 'Project'; +$lang->score->module['productplan'] = 'Plan'; +$lang->score->module['release'] = 'Release'; +$lang->score->module['block'] = 'Block'; +$lang->score->module['search'] = 'Search'; $lang->score->methods['task']['create'] = 'Create task'; $lang->score->methods['task']['close'] = 'Close task'; diff --git a/module/score/lang/zh-cn.php b/module/score/lang/zh-cn.php index df5e963861..75868acb14 100644 --- a/module/score/lang/zh-cn.php +++ b/module/score/lang/zh-cn.php @@ -24,22 +24,22 @@ $lang->score->noLimit = '不限制'; $lang->score->times = '次数'; $lang->score->hour = '时间间隔'; -$lang->score->models['task'] = '任务'; -$lang->score->models['tutorial'] = '新手教程'; -$lang->score->models['user'] = '用户'; -$lang->score->models['ajax'] = '其它'; -$lang->score->models['doc'] = '文档'; -$lang->score->models['todo'] = '待办'; -$lang->score->models['story'] = '需求'; -$lang->score->models['bug'] = 'Bug'; -$lang->score->models['testcase'] = '用例'; -$lang->score->models['testtask'] = '测试单'; -$lang->score->models['build'] = 'Build'; -$lang->score->models['project'] = '项目'; -$lang->score->models['productplan'] = '计划'; -$lang->score->models['release'] = '发布'; -$lang->score->models['block'] = '区块'; -$lang->score->models['search'] = '搜索'; +$lang->score->module['task'] = '任务'; +$lang->score->module['tutorial'] = '新手教程'; +$lang->score->module['user'] = '用户'; +$lang->score->module['ajax'] = '其它'; +$lang->score->module['doc'] = '文档'; +$lang->score->module['todo'] = '待办'; +$lang->score->module['story'] = '需求'; +$lang->score->module['bug'] = 'Bug'; +$lang->score->module['testcase'] = '用例'; +$lang->score->module['testtask'] = '测试单'; +$lang->score->module['build'] = 'Build'; +$lang->score->module['project'] = '项目'; +$lang->score->module['productplan'] = '计划'; +$lang->score->module['release'] = '发布'; +$lang->score->module['block'] = '区块'; +$lang->score->module['search'] = '搜索'; $lang->score->methods['task']['create'] = '创建任务'; $lang->score->methods['task']['close'] = '关闭任务'; diff --git a/module/score/lang/zh-tw.php b/module/score/lang/zh-tw.php index fb609cb1e6..848dfa66f2 100644 --- a/module/score/lang/zh-tw.php +++ b/module/score/lang/zh-tw.php @@ -24,22 +24,22 @@ $lang->score->noLimit = '不限制'; $lang->score->times = '次數'; $lang->score->hour = '時間間隔'; -$lang->score->models['task'] = '任務'; -$lang->score->models['tutorial'] = '新手教程'; -$lang->score->models['user'] = '用戶'; -$lang->score->models['ajax'] = '其它'; -$lang->score->models['doc'] = '文檔'; -$lang->score->models['todo'] = '待辦'; -$lang->score->models['story'] = '需求'; -$lang->score->models['bug'] = 'Bug'; -$lang->score->models['testcase'] = '用例'; -$lang->score->models['testtask'] = '測試單'; -$lang->score->models['build'] = 'Build'; -$lang->score->models['project'] = '項目'; -$lang->score->models['productplan'] = '計劃'; -$lang->score->models['release'] = '發佈'; -$lang->score->models['block'] = '區塊'; -$lang->score->models['search'] = '搜索'; +$lang->score->module['task'] = '任務'; +$lang->score->module['tutorial'] = '新手教程'; +$lang->score->module['user'] = '用戶'; +$lang->score->module['ajax'] = '其它'; +$lang->score->module['doc'] = '文檔'; +$lang->score->module['todo'] = '待辦'; +$lang->score->module['story'] = '需求'; +$lang->score->module['bug'] = 'Bug'; +$lang->score->module['testcase'] = '用例'; +$lang->score->module['testtask'] = '測試單'; +$lang->score->module['build'] = 'Build'; +$lang->score->module['project'] = '項目'; +$lang->score->module['productplan'] = '計劃'; +$lang->score->module['release'] = '發佈'; +$lang->score->module['block'] = '區塊'; +$lang->score->module['search'] = '搜索'; $lang->score->methods['task']['create'] = '創建任務'; $lang->score->methods['task']['close'] = '關閉任務'; diff --git a/module/score/model.php b/module/score/model.php index 63116f2afa..2954b353dc 100644 --- a/module/score/model.php +++ b/module/score/model.php @@ -40,7 +40,7 @@ class scoreModel extends model if(empty($this->config->score->$module->$method) || empty($this->config->global->scoreStatus)) return true; $rule = $this->config->score->$module->$method; - $desc = $this->lang->score->models[$module]; + $desc = $this->lang->score->module[$module]; $user = empty($account) ? $this->app->user->account : $account; $time = empty($time) ? helper::now() : $time; @@ -97,7 +97,7 @@ class scoreModel extends model if($method == 'createFormCase') { - $desc = $this->lang->score->models['testcase'] . 'ID:' . $param; + $desc = $this->lang->score->module['testcase'] . 'ID:' . $param; $openedBy = $this->dao->findById($param)->from(TABLE_CASE)->fetch('openedBy'); if(!empty($openedBy)) $user = $openedBy; } diff --git a/module/score/view/rule.html.php b/module/score/view/rule.html.php index f3619252c1..94c4e2473a 100644 --- a/module/score/view/rule.html.php +++ b/module/score/view/rule.html.php @@ -24,7 +24,7 @@ score->times;?> score->hour;?> score->score;?> - score->comment;?> + score->desc;?>