Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix bug

Browse Source
This commit is contained in:
滔哥
2017-11-09 15:12:02 +08:00
parent e627415f6c
commit 40995c4dc3
8 changed files with 63 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/custom/control.php
+4 -2
View File
@@ -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();
}
module/my/control.php
+5 -4
View File
@@ -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();
}
module/score/control.php
+3 -2
View File
@@ -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();
}
module/score/lang/en.php
+16 -16
View File
@@ -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';
module/score/lang/zh-cn.php
+16 -16
View File
@@ -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'] = '关闭任务';
module/score/lang/zh-tw.php
+16 -16
View File
@@ -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'] = '關閉任務';
module/score/model.php
+2 -2
View File
@@ -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;
}
module/score/view/rule.html.php
+1 -1
View File
@@ -24,7 +24,7 @@
<th class="w-150px"><?php echo $lang->score->times;?></th>
<th class="w-150px"><?php echo $lang->score->hour;?></th>
<th class="w-150px"><?php echo $lang->score->score;?></th>
<th><?php echo $lang->score->comment;?></th>
<th><?php echo $lang->score->desc;?></th>
</tr>
</thead>
<tbody>