From fd0272d7da43ccdedec48da7f215669f5cb4f978 Mon Sep 17 00:00:00 2001
From: liugang <liugang@cnezsoft.com>
Date: Tue, 13 Aug 2019 16:32:53 +0800
Subject: [PATCH] * Display labels of user defined flows.

---
 module/group/css/managepriv.css        |  3 +++
 module/group/view/privbygroup.html.php | 28 +++++++++++++++++++++++---
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/module/group/css/managepriv.css b/module/group/css/managepriv.css
index a7d7b2b229..3360a8146a 100644
--- a/module/group/css/managepriv.css
+++ b/module/group/css/managepriv.css
@@ -6,3 +6,6 @@
 
 #mainMenu #groupName{line-height:33px; float: left}
 .checkbox-right{padding-left:0px !important;}
+
+td.menus {border-right: 0;padding-right: 0;width: 220px !important;}
+td.menus + td {border-left: 0;}
diff --git a/module/group/view/privbygroup.html.php b/module/group/view/privbygroup.html.php
index e4a505a011..f570a79f70 100644
--- a/module/group/view/privbygroup.html.php
+++ b/module/group/view/privbygroup.html.php
@@ -73,7 +73,7 @@
       <thead>
         <tr class='text-center'>
           <th class='thWidth'><?php echo $lang->group->module;?></th>
-          <th><?php echo $lang->group->method;?></th>
+          <th colspan='2'><?php echo $lang->group->method;?></th>
         </tr>
       </thead>
       <?php foreach($lang->resource as $moduleName => $moduleActions):?>
@@ -102,7 +102,13 @@
             <label class='text-right' for='allChecker<?php echo $moduleName;?>'><?php echo $lang->$moduleName->common;?></label>
           </div>
         </th>
-        <td id='<?php echo $moduleName;?>' class='pv-10px'>
+        <?php if(isset($lang->$moduleName->menus)):?>
+        <td class='menus'>
+          <?php echo html::checkbox("actions[$moduleName]", array('browse' => $lang->$moduleName->browse), isset($groupPrivs[$moduleName]) ? $groupPrivs[$moduleName] : '');?>
+          <?php echo html::checkbox("actions[$moduleName]", $lang->$moduleName->menus, isset($groupPrivs[$moduleName]) ? $groupPrivs[$moduleName] : '');?>
+        </td>
+        <?php endif;?>
+        <td id='<?php echo $moduleName;?>' class='pv-10px' colspan='<?php echo !empty($lang->$moduleName->menus) ? 1 : 2?>'>
           <?php $i = 1;?>
           <?php if($moduleName == 'caselib') $moduleName = 'testsuite';?>
           <?php foreach($moduleActions as $action => $actionLabel):?>
@@ -121,7 +127,7 @@
             <label class='text-right' for='allChecker'><?php echo $lang->selectAll;?></label>
           </div>
         </th>
-        <td class='form-actions'>
+        <td class='form-actions' colspan='2'>
           <?php echo html::submitButton('', "onclick='setNoChecked()'", 'btn btn-wide btn-primary');?>
           <?php echo html::backButton();?>
           <?php echo html::hidden('noChecked'); // Save the value of no checked.?>
@@ -133,3 +139,19 @@
 <?php endif;?>
 <?php js::set('groupID', $groupID);?>
 <?php js::set('menu', $menu);?>
+<script>
+$(document).ready(function()
+{
+    $('.menus input[value=browse]').change(function()
+    {
+        $(this).parents('.menus').find('[name^=actions]').prop('checked', $(this).prop('checked'));
+    });
+
+    $('.menus input[name^=actions]:not(input[value=browse])').click(function()
+    {
+        var $parent = $(this).parents('.menus');
+
+        $parent.find('input[value=browse]').prop('checked', $parent.find('input[name^=actions]:not(input[value=browse]):checked').length > 0);
+    })
+});
+</script>