score->resetTips; ?>
- +diff --git a/lib/base/pager/pager.class.php b/lib/base/pager/pager.class.php index 6ab59865a4..0f55d8ccdf 100644 --- a/lib/base/pager/pager.class.php +++ b/lib/base/pager/pager.class.php @@ -545,7 +545,6 @@ class basePager vars = vars.replace('_recTotal_', recTotal) vars = vars.replace('_recPerPage_', recPerPage) vars = vars.replace('_pageID_', pageID); - $.get(createLink('score', 'ajax', "method=submitPage")); location.href=createLink('$this->moduleName', '$this->methodName', vars); } diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php index ad9fe82145..6940181913 100644 --- a/module/custom/lang/en.php +++ b/module/custom/lang/en.php @@ -124,8 +124,8 @@ $lang->custom->workingList['onlyTask'] = 'Task'; $lang->custom->menuTip = 'Click to show/hide navigation bar. Drag to swtich display order.'; $lang->custom->saveFail = 'Failed to save!'; -$lang->custom->scoreList[0] = 'Off'; -$lang->custom->scoreList[1] = 'On'; +$lang->custom->scoreStatus[0] = 'Off'; +$lang->custom->scoreStatus[1] = 'On'; $lang->custom->moduleName['product'] = $lang->productCommon; $lang->custom->moduleName['productplan'] = 'Plan'; diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php index 6309389af2..5d17b21186 100644 --- a/module/custom/lang/zh-cn.php +++ b/module/custom/lang/zh-cn.php @@ -124,8 +124,8 @@ $lang->custom->workingList['onlyTask'] = '任务管理工具'; $lang->custom->menuTip = '点击显示或隐藏导航条目,拖拽来更改显示顺序。'; $lang->custom->saveFail = '保存失败!'; -$lang->custom->scoreList[0] = '关闭'; -$lang->custom->scoreList[1] = '开启'; +$lang->custom->scoreStatus[0] = '关闭'; +$lang->custom->scoreStatus[1] = '开启'; $lang->custom->moduleName['product'] = $lang->productCommon; $lang->custom->moduleName['productplan'] = '计划'; diff --git a/module/custom/lang/zh-tw.php b/module/custom/lang/zh-tw.php index 8f0632ea1c..3cace44c0d 100644 --- a/module/custom/lang/zh-tw.php +++ b/module/custom/lang/zh-tw.php @@ -124,8 +124,8 @@ $lang->custom->workingList['onlyTask'] = '任務管理工具'; $lang->custom->menuTip = '點擊顯示或隱藏導航條目,拖拽來更改顯示順序。'; $lang->custom->saveFail = '保存失敗!'; -$lang->custom->scoreList[0] = '關閉'; -$lang->custom->scoreList[1] = '開啟'; +$lang->custom->scoreStatus[0] = '關閉'; +$lang->custom->scoreStatus[1] = '開啟'; $lang->custom->moduleName['product'] = $lang->productCommon; $lang->custom->moduleName['productplan'] = '計劃'; diff --git a/module/custom/model.php b/module/custom/model.php index c901a32fe3..51ee02eca4 100644 --- a/module/custom/model.php +++ b/module/custom/model.php @@ -286,7 +286,7 @@ class customModel extends model $customMenu = isset($config->customMenu->$flowModule) ? $config->customMenu->$flowModule : array(); if(commonModel::isTutorialMode() && $module === 'main')$customMenu = 'my,product,project,qa,company'; if(!empty($customMenu) && is_string($customMenu) && substr($customMenu, 0, 1) === '[') $customMenu = json_decode($customMenu); - if($module == 'my' && empty($config->global->score)) unset($allMenu->score); + if($module == 'my' && empty($config->global->scoreStatus)) unset($allMenu->score); $menu = self::setMenuByConfig($allMenu, $customMenu, $module); return $menu; } diff --git a/module/custom/view/score.html.php b/module/custom/view/score.html.php index dbfad8a712..f5f6319945 100644 --- a/module/custom/view/score.html.php +++ b/module/custom/view/score.html.php @@ -15,7 +15,7 @@
| custom->score;?> | -custom->scoreList, isset($config->global->score) ? $config->global->score : 0, '', 'block');?> | +custom->scoreStatus, isset($config->global->scoreStatus) ? $config->global->scoreStatus : 0, '', 'block');?> |
|---|---|---|
| diff --git a/module/score/model.php b/module/score/model.php index 02fdb7f696..63116f2afa 100644 --- a/module/score/model.php +++ b/module/score/model.php @@ -37,7 +37,7 @@ class scoreModel extends model */ public function create($module = '', $method = '', $param = '', $account = '', $time = '') { - if(empty($this->config->score->$module->$method)) return true; + 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]; @@ -281,7 +281,7 @@ class scoreModel extends model */ public function getNotice() { - if(!isset($this->config->global->score) || empty($this->config->global->score)) return ''; + if(empty($this->config->global->scoreStatus)) return ''; if(date('Y-m-d', $this->app->user->lastTime) == helper::today()) return ''; $this->app->user->lastTime = time(); diff --git a/module/score/view/reset.html.php b/module/score/view/reset.html.php index da67a8c32e..7266325b87 100644 --- a/module/score/view/reset.html.php +++ b/module/score/view/reset.html.php @@ -10,31 +10,31 @@ */ ?> - |