diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php index 09dbfc6b96..67012793a1 100644 --- a/module/execution/lang/zh-cn.php +++ b/module/execution/lang/zh-cn.php @@ -86,7 +86,7 @@ $lang->execution->orderAB = '排序'; $lang->execution->products = '相关' . $lang->productCommon; $lang->execution->whitelist = '白名单'; $lang->execution->addWhitelist = '添加白名单'; -$lang->execution->unbindWhitelist = '删除白名单'; +$lang->execution->unbindWhitelist = '移除白名单'; $lang->execution->totalEstimate = '预计'; $lang->execution->totalConsumed = '消耗'; $lang->execution->totalLeft = '剩余'; diff --git a/module/install/ui/step4.html.php b/module/install/ui/step4.html.php index 01bed28c3c..b9b105be16 100644 --- a/module/install/ui/step4.html.php +++ b/module/install/ui/step4.html.php @@ -156,7 +156,7 @@ div btn ( on::click('selectUsage'), - set::id('useLight'), + set::id('light'), set::btnType('submit'), setClass('px-4'), $lang->custom->useLight, @@ -167,7 +167,7 @@ div btn ( on::click('selectUsage'), - set::id('useALM'), + set::id('ALM'), set::btnType('submit'), setClass('px-4'), $lang->custom->useALM, diff --git a/module/personnel/lang/zh-cn.php b/module/personnel/lang/zh-cn.php index 638328a195..d30f1ccd68 100644 --- a/module/personnel/lang/zh-cn.php +++ b/module/personnel/lang/zh-cn.php @@ -32,7 +32,7 @@ $lang->personnel->SR = $lang->SRCommon; $lang->personnel->whitelist = '白名单列表'; $lang->personnel->addWhitelist = '添加白名单'; -$lang->personnel->unbindWhitelist = '删除白名单'; +$lang->personnel->unbindWhitelist = '移除白名单'; $lang->personnel->confirmDelete = '确认将该用户移除白名单？'; $lang->personnel->copy = '复制白名单'; diff --git a/module/program/lang/zh-cn.php b/module/program/lang/zh-cn.php index afc201f68b..f577883b20 100644 --- a/module/program/lang/zh-cn.php +++ b/module/program/lang/zh-cn.php @@ -61,7 +61,7 @@ $lang->program->browse = '项目集列表'; $lang->program->kanbanAction = '项目集看板'; $lang->program->view = '项目集详情'; $lang->program->copy = '复制项目集'; -$lang->program->product = "{$lang->productCommon}列表"; +$lang->program->product = "项目集{$lang->productCommon}列表"; $lang->program->project = "项目集{$lang->projectCommon}列表"; $lang->program->all = '所有项目集'; $lang->program->start = '启动项目集'; diff --git a/module/programplan/tao.php b/module/programplan/tao.php index 6d19b409a6..156f752c90 100644 --- a/module/programplan/tao.php +++ b/module/programplan/tao.php @@ -320,8 +320,8 @@ class programplanTao extends programplanModel $data->realEnd = $realEnd ? substr($realEnd, 0, 10) : ''; $data->parent = $plan->grade == 1 ? 0 :$plan->parent; $data->open = true; - $data->start_date = $realBegan ? $realBegan : $start; - $data->endDate = $realEnd ? $realEnd : $end; + $data->start_date = $start; + $data->endDate = $end; $data->duration = 1; $data->color = $this->lang->execution->gantt->stage->color; $data->progressColor = $this->lang->execution->gantt->stage->progressColor; diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index 11583136d9..6eda2a1167 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -42,7 +42,7 @@ $lang->project->updateOrder = '排序'; $lang->project->sort = "{$lang->projectCommon}排序"; $lang->project->whitelist = "{$lang->projectCommon}白名单"; $lang->project->addWhitelist = "{$lang->projectCommon}添加白名单"; -$lang->project->unbindWhitelist = "{$lang->projectCommon}删除白名单"; +$lang->project->unbindWhitelist = "{$lang->projectCommon}移除白名单"; $lang->project->manageProducts = "关联{$lang->productCommon}"; $lang->project->manageOtherProducts = "关联其他{$lang->productCommon}"; $lang->project->manageProductPlan = "关联{$lang->productCommon}和计划"; diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php index d2153161ae..deaa1ad52e 100644 --- a/module/story/lang/zh-cn.php +++ b/module/story/lang/zh-cn.php @@ -516,7 +516,7 @@ $lang->requirement->activateAction = "激活{$lang->URCommon}"; $lang->requirement->deleteAction = "删除{$lang->URCommon}"; $lang->requirement->exportAction = "导出{$lang->URCommon}"; $lang->requirement->reportAction = "统计报表"; -$lang->requirement->recall = $lang->story->recallAction; +$lang->requirement->recall = $lang->story->recall; $lang->requirement->batchReview = '批量评审'; $lang->requirement->batchEdit = "批量编辑"; $lang->requirement->batchClose = '批量关闭'; diff --git a/module/todo/ui/create.html.php b/module/todo/ui/create.html.php index 8adfb14bde..3511b031ed 100644 --- a/module/todo/ui/create.html.php +++ b/module/todo/ui/create.html.php @@ -82,7 +82,7 @@ formPanel on::change("zui.DatePicker.query('#date').render({disabled: e.target.checked})") ) ), - div( + common::hasPriv('todo', 'createcycle') ? div( setClass('input-group-addon'), checkbox ( @@ -92,7 +92,7 @@ formPanel set::text($lang->todo->cycle), on::change('toggleCycle') ) - ) + ) : null ) ), ), diff --git a/module/user/model.php b/module/user/model.php index 7e3b130622..d9a397262d 100644 --- a/module/user/model.php +++ b/module/user/model.php @@ -1137,11 +1137,9 @@ class userModel extends model } /* Set basic priv when no any priv. */ - if(empty($rights)) - { - $rights['index']['index'] = 1; - $rights['my']['index'] = 1; - } + $rights['index']['index'] = 1; + $rights['my']['index'] = 1; + return array('rights' => $rights, 'acls' => $acls, 'projects' => $canManageProjects, 'programs' => $canManagePrograms, 'products' => $canManageProducts, 'executions' => $canManageExecutions); }