* Finish task #8110.

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;

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';

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        = "暂时没有项目";

module/group/view/browse.html.php

@@ -45,7 +45,7 @@
           <?php $isPRJadmin = $group->role == 'PRJadmin';?>
           <?php $disabled   = $isPRJadmin ? 'disabled' : '';?>
           <?php $lang->group->managepriv = $lang->group->managePrivByGroup;?>
-          <?php common::printIcon('group', 'manageView', "groupID=$group->id", $group, 'list', 'eye', '', "iframe $disabled", true);?>
+          <?php common::printIcon('group', 'manageView', "groupID=$group->id", $group, 'list', 'eye', '', "$disabled");?>
           <?php common::printIcon('group', 'managepriv', "type=byGroup&param=$group->id", $group, 'list', 'lock');?>
           <?php $lang->group->managemember = $lang->group->manageMember;?>
           <?php if($isPRJadmin):?>

module/group/view/manageview.html.php

@@ -20,10 +20,10 @@
   </div>
   <form class="load-indicator main-form form-ajax" id="manageViewForm" method="post" target='hiddenwin'>
     <table class='table table-form'>
-      <!--tr>
+      <tr>
         <th class='text-bottom thWidth'><?php echo $lang->group->viewList;?></th>
         <td class='text-bottom'>
-          <?php foreach($lang->menu as $menuKey => $menu):?>
+          <?php foreach($lang->mainNav as $menuKey => $menu):?>
           <?php if(!is_string($menu)) continue;?>
           <?php list($moduleName, $module) = explode('|', $menu);?>
           <?php if($module == 'my') continue;?>
@@ -46,13 +46,26 @@
             </div>
           </div>
         </td>
-      </tr-->
-      <tr id='productBox'>
-        <th class='text-right'><?php echo $lang->group->programList?></th>
+      </tr>
+      <tr id='productBox' style='display:none'>
+        <th class='text-right'><?php echo $lang->group->productList?></th>
         <td>
-          <?php if($programs):?>
+          <?php if($products):?>
           <div class='input-group'>
-            <?php echo html::select("actions[programs][]", $programs, isset($group->acl['programs']) ? join(',', $group->acl['programs']) : '', "class='form-control chosen' drop_direction='down' multiple")?>
+            <?php echo html::select("actions[products][]", $products, isset($group->acl['products']) ? join(',', $group->acl['products']) : '', "class='form-control chosen' multiple")?>
+            <span class='input-group-addon strong'><?php echo $lang->group->noticeVisit?></span>
+          </div>
+          <?php else:?>
+          <?php echo $lang->group->noneProduct;?>
+          <?php endif;?>
+        </td>
+      </tr>
+      <tr id='projectBox' style='display:none'>
+        <th class='text-right'><?php echo $lang->group->projectList?></th>
+        <td>
+          <?php if($projects):?>
+          <div class='input-group'>
+            <?php echo html::select("actions[projects][]", $projects, isset($group->acl['projects']) ? join(',', $group->acl['projects']) : '', "class='form-control chosen' drop_direction='down' multiple")?>
             <span class='input-group-addon strong'><?php echo $lang->group->noticeVisit?></span>
           </div>
           <?php else:?>
@@ -60,24 +73,11 @@
           <?php endif;?>
         </td>
       </tr>
-      <!--tr id='projectBox' style='display:none'>
-        <th class='text-right'><?php echo $lang->group->projectList?></th>
-        <td>
-          <?php if($products):?>
-          <div class='input-group'>
-            <?php echo html::select("actions[projects][]", $projects, isset($group->acl['projects']) ? join(',', $group->acl['projects']) : '', "class='form-control chosen' multiple")?>
-            <span class='input-group-addon strong'><?php echo $lang->group->noticeVisit?></span>
-          </div>
-          <?php else:?>
-          <?php echo $lang->group->noneProject;?>
-          <?php endif;?>
-        </td>
-      </tr>
      <tr>
         <th class='text-right text-top'><?php echo $lang->group->dynamic?></th>
         <td class='pl-0px pt-0px'>
           <table class='table table-form'>
-            <?php foreach($lang->menu as $module => $title):?>
+            <?php foreach($lang->mainNav as $module => $title):?>
             <?php if(!is_string($title)) continue;?>
             <?php if(!isset($lang->action->dynamicAction->$module) and !isset($menugroup[$module])) continue;?>
             <tr id='<?php echo "{$module}ActionBox";?>'>
@@ -123,7 +123,7 @@
             <?php endforeach;?>
           </table>
         </td>
-     </tr-->
+     </tr>
       <tr>
         <td colspan='2' class='form-actions text-center'>
           <?php echo html::submitButton();?>