diff --git a/module/group/control.php b/module/group/control.php index c60d8fc190..092662ac7b 100644 --- a/module/group/control.php +++ b/module/group/control.php @@ -146,6 +146,7 @@ class group extends control $this->view->position[] = $group->name . $this->lang->colon . $this->lang->group->managePriv; $this->view->group = $group; + $this->view->changelogs = $this->lang->changelog; $this->view->groupPrivs = $groupPrivs; } diff --git a/module/group/js/managepriv.js b/module/group/js/managepriv.js index d688ee4b5e..cdb39ad9b8 100644 --- a/module/group/js/managepriv.js +++ b/module/group/js/managepriv.js @@ -14,6 +14,16 @@ function checkall(checker) }); } +function showPriv() +{ + var version = $('#version').val(); + $('.priv').removeClass('red'); + privs = newPriv[version]; + for(var item in privs) + { + $('#' + privs[item]).addClass('red'); + } +} /** * Control the actions select control for a module. * diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index f5cb9d3378..18867ad05c 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -247,3 +247,44 @@ $lang->group->newPriv['task']['close'] = 'close'; $lang->group->newPriv['task']['batchClose'] = 'batchClose'; $lang->group->newPriv['task']['finish'] = 'finish'; $lang->group->newPriv['search']['select'] = 'select'; + +/* Every version of new privilege. */ + +$lang->changelog['1.0.1'][] = 'project-computeBurn'; + +$lang->changelog['1.1'][] = 'search-saveQuery'; +$lang->changelog['1.1'][] = 'search-deleteQuery'; + +$lang->changelog['1.2'][] = 'product-doc'; +$lang->changelog['1.2'][] = 'project-doc'; +$lang->changelog['1.2'][] = 'project-ajaxGetProducts'; +$lang->changelog['1.2'][] = 'bug-saveTemplate'; +$lang->changelog['1.2'][] = 'bug-deleteTemplate'; +$lang->changelog['1.2'][] = 'bug-customFields'; +$lang->changelog['1.2'][] = 'bug-ajaxGetModuleOwner'; +$lang->changelog['1.2'][] = 'doc-index'; +$lang->changelog['1.2'][] = 'doc-browse'; +$lang->changelog['1.2'][] = 'doc-createLib'; +$lang->changelog['1.2'][] = 'doc-editLib'; +$lang->changelog['1.2'][] = 'doc-deleteLib'; +$lang->changelog['1.2'][] = 'doc-create'; +$lang->changelog['1.2'][] = 'doc-view'; +$lang->changelog['1.2'][] = 'doc-edit'; +$lang->changelog['1.2'][] = 'doc-delete'; +$lang->changelog['1.2'][] = 'doc-deleteFile'; + +$lang->changelog['1.3'][] = 'task-start'; +$lang->changelog['1.3'][] = 'task-complete'; +$lang->changelog['1.3'][] = 'task-cancel'; +$lang->changelog['1.3'][] = 'tree-ajaxGetSonModules'; +$lang->changelog['1.3'][] = 'file-delete'; +$lang->changelog['1.3'][] = 'file-ajaxUpload'; + +$lang->changelog['1.4'][] = 'my-testTask'; +$lang->changelog['1.4'][] = 'my-testCase'; +$lang->changelog['1.4'][] = 'task-finish'; +$lang->changelog['1.4'][] = 'task-close'; +$lang->changelog['1.4'][] = 'task-activate'; +$lang->changelog['1.4'][] = 'search-select'; + +$lang->changelog['1.5'][] = 'task-batchClose'; diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php index 9c757b960a..d3b72e72db 100644 --- a/module/group/lang/zh-cn.php +++ b/module/group/lang/zh-cn.php @@ -40,4 +40,14 @@ $lang->group->outside = '组外用户'; $lang->group->copyOptions['copyPriv'] = '复制权限'; $lang->group->copyOptions['copyUser'] = '复制用户'; +$lang->group->query = '标红'; +$lang->group->addPriv = '版本新增权限'; +$lang->group->versions['1.0.1'] = '禅道1.0.1'; +$lang->group->versions['1.1'] = '禅道1.1'; +$lang->group->versions['1.2'] = '禅道1.2'; +$lang->group->versions['1.3'] = '禅道1.3'; +$lang->group->versions['1.4'] = '禅道1.4'; +$lang->group->versions['1.5'] = '禅道1.5'; +$lang->group->versions['2.0'] = '禅道2.0'; + include (dirname(__FILE__) . '/resource.php'); diff --git a/module/group/view/privbygroup.html.php b/module/group/view/privbygroup.html.php index 5bdfa58976..1ee131207f 100644 --- a/module/group/view/privbygroup.html.php +++ b/module/group/view/privbygroup.html.php @@ -12,7 +12,15 @@ ?>
- + @@ -25,9 +33,11 @@ $actionLabel):?>
/> group->newPriv[$moduleName][$actionLabel])):?> - $moduleName->$actionLabel;?> + >$moduleName->$actionLabel;?> + > $moduleName->$actionLabel;?> +
"; $i ++;?> @@ -47,3 +57,6 @@
name . $lang->colon . $lang->group->managePriv;?>name . $lang->colon . $lang->group->managePriv;?> + + group->addPriv . $lang->colon; + echo html::select('version', $this->lang->group->versions); + echo html::commonButton($this->lang->group->query, "onclick=showPriv()"); + ?> + +
group->module;?> group->method;?>
+