diff --git a/extension/lite/execution/ext/lang/en/lite.php b/extension/lite/execution/ext/lang/en/lite.php index 77fd87e1bf..89dcb59beb 100644 --- a/extension/lite/execution/ext/lang/en/lite.php +++ b/extension/lite/execution/ext/lang/en/lite.php @@ -23,5 +23,4 @@ $lang->execution->icons['grouptask'] = 'sitemap'; $lang->execution->aclList['private'] = "Private (Accessible to team members and project leaders)"; -$lang->execution->common = 'Project Execution'; -$lang->execution->gantt = 'Gantt Chart'; \ No newline at end of file +$lang->execution->common = 'Project Execution'; \ No newline at end of file diff --git a/extension/lite/execution/ext/lang/zh-cn/lite.php b/extension/lite/execution/ext/lang/zh-cn/lite.php index 9b74698b2e..91943c1558 100644 --- a/extension/lite/execution/ext/lang/zh-cn/lite.php +++ b/extension/lite/execution/ext/lang/zh-cn/lite.php @@ -24,5 +24,4 @@ $lang->execution->icons['grouptask'] = 'sitemap'; $lang->execution->aclList['private'] = "私有(团队成员和项目负责人可访问)"; -$lang->execution->common = '项目看板'; -$lang->execution->gantt = '甘特图'; \ No newline at end of file +$lang->execution->common = '项目看板'; \ No newline at end of file diff --git a/extension/lite/execution/ext/model/lite.php b/extension/lite/execution/ext/model/lite.php index 6322bdbdec..c30cfcba32 100644 --- a/extension/lite/execution/ext/model/lite.php +++ b/extension/lite/execution/ext/model/lite.php @@ -127,13 +127,20 @@ public function getTRActions($currentMethod) foreach($subMenu as $key => $value) { - $tmpValue = explode('|', $value['link']); - $subMenu->{$key}['name'] = $tmpValue[0]; - $subMenu->{$key}['module'] = $tmpValue[1]; - $subMenu->{$key}['method'] = $tmpValue[2]; - $subMenu->{$key}['vars'] = $tmpValue[3]; + if(common::hasPriv('execution', $key)) + { + $tmpValue = explode('|', $value['link']); + $subMenu->{$key}['name'] = $tmpValue[0]; + $subMenu->{$key}['module'] = $tmpValue[1]; + $subMenu->{$key}['method'] = $tmpValue[2]; + $subMenu->{$key}['vars'] = $tmpValue[3]; + } + else + { + unset($subMenu->$key); + } } - + $TRActions = ''; $TRActions .= "
+ cookie->kanbanview) + { + $kanbanview = $this->cookie->kanbanview; + } + else + { + foreach (explode('|', 'kanban|task|calendar|gantt|tree|grouptask') as $view) + { + if(common::hasPriv('execution', $view)) $kanbanview = 'kanban'; + } + } + ?> $kanban):?> -
cookie->kanbanview ? $this->cookie->kanbanview : 'kanban', "kanbanID=$kanban->id");?>'> +
id");?>'>
execution->statusList, $kanban->status);?> diff --git a/module/user/view/deny.html.php b/module/user/view/deny.html.php index 24584d652b..dc42f44198 100644 --- a/module/user/view/deny.html.php +++ b/module/user/view/deny.html.php @@ -23,6 +23,8 @@ include '../../common/view/header.lite.html.php'; $moduleName = isset($lang->$module->common) ? $lang->$module->common : $module; $methodName = isset($lang->$module->$method) ? $lang->$module->$method : $method; + if($module == 'execution' && $method == 'gantt') $methodName = $methodName->common; + /* find method name if method is lowercase letter. */ if(!isset($lang->$module->$method)) {