From bba0c40dfe3be4fb9a27e1bebe0d51dbf8152cf6 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 1 Dec 2021 11:25:02 +0800
Subject: [PATCH] * Fix bug #16882, #16924.

---
 module/action/model.php                 | 10 ++++++----
 module/company/css/dynamic.css          |  4 ++--
 module/group/view/privbygroup.html.php  |  5 +----
 module/project/view/managepriv.html.php |  5 +----
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/module/action/model.php b/module/action/model.php
index ad7a2819ac..8fd7c1ee02 100755
--- a/module/action/model.php
+++ b/module/action/model.php
@@ -1482,12 +1482,14 @@ class actionModel extends model
         {
             $dateGroup = array_reverse($dateGroup);
         }
-        elseif($this->app->rawModule == 'company' and (($direction == 'next' and $orderBy == 'date_asc') or ($direction == 'pre' and $orderBy == 'date_desc')))
+        elseif($this->app->rawModule == 'company')
         {
-            $dateGroup = array_reverse($dateGroup);
-            foreach($dateGroup as $key => $dateItem) $dateGroup[$key] = array_reverse($dateItem);
+            if($direction == 'pre') $dateGroup = array_reverse($dateGroup);
+            if(($direction == 'next' and $orderBy == 'date_asc') or ($direction == 'pre' and $orderBy == 'date_desc'))
+            {
+                foreach($dateGroup as $key => $dateItem) $dateGroup[$key] = array_reverse($dateItem);
+            }
         }
-
         return $dateGroup;
     }
 
diff --git a/module/company/css/dynamic.css b/module/company/css/dynamic.css
index 46ef0cf002..e80d820228 100644
--- a/module/company/css/dynamic.css
+++ b/module/company/css/dynamic.css
@@ -18,6 +18,6 @@
 .dynamic.collapsed .timeline > li + li {display: none;}
 .dynamic.collapsed .dynamic-btn > .icon:before {content: '\f0d8';}
 
-.c-project, .c-product, .c-execution {width: 140px !important; overflow: unset;}
-.c-user,.c-order {width: 100px !important; overflow: unset;}
+.c-project, .c-product, .c-execution {width: 110px !important; overflow: unset;}
+.c-user,.c-order {width: 90px !important; overflow: unset;}
 .c-date {width: 200px;}
diff --git a/module/group/view/privbygroup.html.php b/module/group/view/privbygroup.html.php
index 437c1dd605..d3ed83af4d 100644
--- a/module/group/view/privbygroup.html.php
+++ b/module/group/view/privbygroup.html.php
@@ -115,10 +115,7 @@
           <?php if(!empty($lang->$moduleName->menus) and $action == 'browse') continue;;?>
           <?php if(!empty($version) and strpos($changelogs, ",$moduleName-$actionLabel,") === false) continue;?>
           <div class='group-item'>
-            <div class='checkbox-primary checkbox-inline'>
-              <input type='checkbox' name='actions[<?php echo $moduleName;?>][]' value='<?php echo $action;?>' <?php if(isset($groupPrivs[$moduleName][$action])) echo "checked='checked'";?>  id='actions[<?php echo $moduleName . "]" . $action;?>'  title='<?php echo $lang->$moduleName->$actionLabel;?>';>
-              <label for='actions[<?php echo $moduleName . "]" . $action;?>' ><?php echo $lang->$moduleName->$actionLabel;?></label>
-            </div>
+            <?php echo html::checkbox("actions[{$moduleName}]", array($action => $lang->$moduleName->$actionLabel), isset($groupPrivs[$moduleName][$action]) ? $action : '', "title='{$lang->$moduleName->$actionLabel}'", 'inline');?>
           </div>
           <?php endforeach;?>
         </td>
diff --git a/module/project/view/managepriv.html.php b/module/project/view/managepriv.html.php
index c1fd9ecce8..bf223d2e70 100644
--- a/module/project/view/managepriv.html.php
+++ b/module/project/view/managepriv.html.php
@@ -120,10 +120,7 @@ td.menus + td {border-left: 0;}
           <?php if(!empty($lang->$moduleName->menus) and $action == 'browse') continue;;?>
           <?php if(!empty($version) and strpos($changelogs, ",$moduleName-$actionLabel,") === false) continue;?>
           <div class='group-item'>
-            <div class='checkbox-primary checkbox-inline'>
-              <input type='checkbox' name='actions[<?php echo $moduleName;?>][]' value='<?php echo $action;?>' <?php if(isset($groupPrivs[$moduleName][$action])) echo "checked='checked'";?>  id='actions[<?php echo $moduleName . "]" . $action;?>'  title='<?php echo $lang->$moduleName->$actionLabel;?>';>
-              <label for='actions[<?php echo $moduleName . "]" . $action;?>' ><?php echo $lang->$moduleName->$actionLabel;?></label>
-            </div>
+            <?php echo html::checkbox("actions[{$moduleName}]", array($action => $lang->$moduleName->$actionLabel), isset($groupPrivs[$moduleName][$action]) ? $action : '', "title='{$lang->$moduleName->$actionLabel}'", 'inline');?>
           </div>
           <?php endforeach;?>
         </td>