From 520ab923382116f8f7c47d0becdeed083efb4a65 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Wed, 15 Jun 2022 16:17:16 +0800
Subject: [PATCH] * Finish task #57095.

---
 module/execution/css/all.css       |  4 ++--
 module/execution/view/all.html.php | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/module/execution/css/all.css b/module/execution/css/all.css
index 77caf18d70..cc861a697f 100644
--- a/module/execution/css/all.css
+++ b/module/execution/css/all.css
@@ -13,7 +13,7 @@ body {margin-bottom: 25px;}
 .table th.hours {padding-right: 8px !important;}
 .main-table tbody > tr.table-children > td:first-child::before {width: 3px;}
 td.hours {text-align: right; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
-td.flex {display: flex; flex-flow: row nowrap; justify-content: flex-start; align-items: center; margin-bottom: -1px;}
+td.flex {display: flex; flex-flow: row nowrap; justify-content: flex-start; align-items: center; margin-bottom: -2px;}
 td.flex span.label-badge {margin-left: 5px; min-width: 50px;}
 td.flex span.label-badge.label-light {min-width: 22px;}
 td.flex span.project-type-label {margin-left: 5px; min-width: 36px;}
@@ -28,4 +28,4 @@ td.flex span.project-type-label {min-width: 40px;}
 .c-name > .text-ellipsis {text-overflow: clip;}
 
 .c-project{text-overflow: unset !important;}
-canvas {height: 30px;}
+canvas {height: 28px;}
diff --git a/module/execution/view/all.html.php b/module/execution/view/all.html.php
index ccabe39eed..e332219bc4 100644
--- a/module/execution/view/all.html.php
+++ b/module/execution/view/all.html.php
@@ -12,7 +12,10 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/sortable.html.php';?>
 <?php include '../../common/view/datatable.fix.html.php';?>
-<?php $useDatatable = (isset($config->datatable->$datatableId->mode) and $config->datatable->$datatableId->mode == 'datatable');?>
+<?php
+$datatableId  = $this->moduleName . ucfirst($this->methodName);
+$useDatatable = (isset($config->datatable->$datatableId->mode) and $config->datatable->$datatableId->mode == 'datatable');
+?>
 <?php js::set('useDatatable', $useDatatable);?>
 <?php js::set('from', $from);?>
 <?php js::set('projectID', $projectID);?>
@@ -21,8 +24,8 @@
 $unfoldExecutions = isset($config->execution->all->unfoldExecutions) ? json_decode($config->execution->all->unfoldExecutions, true) : array();
 $unfoldExecutions = zget($unfoldExecutions, $projectID, array());
 js::set('unfoldExecutions', $unfoldExecutions);
-js::set('unfoldAll',   $lang->execution->treeLevel['all']);
-js::set('foldAll',     $lang->execution->treeLevel['root']);
+js::set('unfoldAll', $lang->execution->treeLevel['all']);
+js::set('foldAll', $lang->execution->treeLevel['root']);
 ?>
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
@@ -79,9 +82,6 @@ js::set('foldAll',     $lang->execution->treeLevel['root']);
     </p>
   </div>
   <?php else:?>
-  <?php
-  $datatableId  = $this->moduleName . ucfirst($this->methodName);
-  ?>
   <?php $canBatchEdit = common::hasPriv('execution', 'batchEdit'); ?>
   <form class='main-table' id='executionsForm' method='post' action='<?php echo inLink('batchEdit');?>' <?php if(!$useDatatable) echo "data-ride='table'";?>>
     <div class="table-header fixed-right">