diff --git a/module/group/control.php b/module/group/control.php index 147559ee70..8c6e827603 100644 --- a/module/group/control.php +++ b/module/group/control.php @@ -140,9 +140,8 @@ class group extends control $this->view->position[] = $this->lang->group->manageView; $this->view->group = $group; - $this->view->programs = $this->dao->select('*')->from(TABLE_PROJECT)->where('deleted')->eq('0')->andWhere('type')->eq('project')->orderBy('order_desc')->fetchPairs('id', 'name'); + $this->view->projects = $this->dao->select('*')->from(TABLE_PROJECT)->where('deleted')->eq('0')->andWhere('type')->eq('project')->orderBy('order_desc')->fetchPairs('id', 'name'); $this->view->products = $this->dao->select('*')->from(TABLE_PRODUCT)->where('deleted')->eq('0')->orderBy('order_desc')->fetchPairs('id', 'name'); - $this->view->projects = $this->dao->select('*')->from(TABLE_PROJECT)->where('deleted')->eq('0')->orderBy('order_desc')->fetchPairs('id', 'name'); $menugroup = array(); foreach($this->lang->menugroup as $moduleName => $groupName) $menugroup[$groupName][$moduleName] = $moduleName; diff --git a/module/group/lang/en.php b/module/group/lang/en.php index 58908adf9a..79beef7670 100644 --- a/module/group/lang/en.php +++ b/module/group/lang/en.php @@ -25,9 +25,7 @@ $lang->group->managePRJadmin = 'Manage Program Admins'; $lang->group->confirmDelete = 'Do you want to delete this user group?'; $lang->group->successSaved = 'Saved.'; $lang->group->errorNotSaved = 'Failed. Please select actions and groups.'; -$lang->group->program = 'Manage Programs'; $lang->group->viewList = 'Access Sight'; -$lang->group->programList = 'Access Program'; $lang->group->productList = 'Access Product'; $lang->group->projectList = 'Access Project'; $lang->group->dynamic = 'Access Dynamics'; diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php index 8980143128..3a24b7cd58 100644 --- a/module/group/lang/zh-cn.php +++ b/module/group/lang/zh-cn.php @@ -25,11 +25,9 @@ $lang->group->managePRJadmin = '维护项目管理员'; $lang->group->confirmDelete = '您确定删除该用户分组吗?'; $lang->group->successSaved = '成功保存'; $lang->group->errorNotSaved = '没有保存,请确认选择了权限数据。'; -$lang->group->program = '可管理项目'; $lang->group->viewList = '可访问视图'; -$lang->group->programList = '可访问项目'; $lang->group->productList = '可访问' . $lang->productCommon; -$lang->group->projectList = '可访问' . $lang->projectCommon; +$lang->group->projectList = '可访问项目'; $lang->group->dynamic = '可查看动态'; $lang->group->noticeVisit = '空代表没有访问限制'; $lang->group->noneProgram = "暂时没有项目"; diff --git a/module/group/view/browse.html.php b/module/group/view/browse.html.php index 8af9cae44e..a110912fde 100644 --- a/module/group/view/browse.html.php +++ b/module/group/view/browse.html.php @@ -45,7 +45,7 @@ role == 'PRJadmin';?> group->managepriv = $lang->group->managePrivByGroup;?> - id", $group, 'list', 'eye', '', "iframe $disabled", true);?> + id", $group, 'list', 'eye', '', "$disabled");?> id", $group, 'list', 'lock');?> group->managemember = $lang->group->manageMember;?> diff --git a/module/group/view/manageview.html.php b/module/group/view/manageview.html.php index c033f4fae4..3fb24d5b6e 100644 --- a/module/group/view/manageview.html.php +++ b/module/group/view/manageview.html.php @@ -20,10 +20,10 @@