From 4115adbd1d2703255281d1a6fa3085f827aaf0fc Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Tue, 13 Jun 2023 18:59:05 +0800
Subject: [PATCH] * Adjust for user execution page.

---
 module/user/js/execution.ui.js    | 2 +-
 module/user/ui/execution.html.php | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/module/user/js/execution.ui.js b/module/user/js/execution.ui.js
index 737cf8577a..42d9b9a595 100644
--- a/module/user/js/execution.ui.js
+++ b/module/user/js/execution.ui.js
@@ -4,7 +4,7 @@ window.renderCell = function(result, info)
     if(info.col.name == 'name' && result)
     {
         let html = '';
-        if(edition == 'max') html = "<span class='project-type-label label label-info label-outline'>" + executionTypeList[execution.type] + "</span>";
+        if(edition == 'max' && typeof(executionTypeList[execution.type]) != 'undefined') html = "<span class='project-type-label label label-info label-outline'>" + executionTypeList[execution.type] + "</span>";
         if(html) result.unshift({html});
     }
     return result;
diff --git a/module/user/ui/execution.html.php b/module/user/ui/execution.html.php
index 3ce6256c95..743f1b2131 100644
--- a/module/user/ui/execution.html.php
+++ b/module/user/ui/execution.html.php
@@ -21,10 +21,12 @@ $cols['name']['nestedToggle'] = false;
 $cols['name']['type']         = 'text';
 $cols['name']['link']         = array('module' => 'execution', 'method' => 'view', 'params' => 'executionID={id}');
 
-$cols['id']    = array('type' => 'checkID', 'fixed' => 'left', 'title' => $lang->idAB, 'checkbox' => false);
+$cols['id']    = array('type' => 'checkID', 'title' => $lang->idAB, 'checkbox' => false);
 $cols['role']  = array('type' => 'user',    'title' => $lang->team->role);
 $cols['join']  = array('type' => 'date',    'title' => $lang->team->join);
-$cols['hours'] = array('type' => 'number',  'title' => $lang->team->hours);
+$cols['hours'] = array('type' => 'number',  'width' => 100, 'title' => $lang->team->hours);
+
+$cols = array_map(function($col){unset($col['fixed'], $col['sortType']); return $col;}, $cols);
 
 panel
 (