From fb1c7c6cab9dec471c9cafc1298f0c5adcf54b2a Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Thu, 26 Oct 2023 14:18:56 +0800
Subject: [PATCH] * Change sortType to sort in execution block.

---
 module/block/config/executionblock.php | 50 +++++++++++++-------------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/module/block/config/executionblock.php b/module/block/config/executionblock.php
index 0a4f456e87..dd4098f83b 100644
--- a/module/block/config/executionblock.php
+++ b/module/block/config/executionblock.php
@@ -5,37 +5,39 @@ $app->loadLang('execution');
 $config->block->execution = new stdclass();
 $config->block->execution->dtable = new stdclass();
 $config->block->execution->dtable->fieldList = array();
-$config->block->execution->dtable->fieldList['name']['name']        = 'name';
-$config->block->execution->dtable->fieldList['name']['title']       = $lang->execution->name;
-$config->block->execution->dtable->fieldList['name']['link']        = array('module' => 'execution', 'method' => 'task', 'params' => 'executionID={id}');
-$config->block->execution->dtable->fieldList['name']['type']        = 'title';
+$config->block->execution->dtable->fieldList['name']['name']  = 'name';
+$config->block->execution->dtable->fieldList['name']['title'] = $lang->execution->name;
+$config->block->execution->dtable->fieldList['name']['link']  = array('module' => 'execution', 'method' => 'task', 'params' => 'executionID={id}');
+$config->block->execution->dtable->fieldList['name']['type']  = 'title';
+$config->block->execution->dtable->fieldList['name']['sort']  = true;
 
-$config->block->execution->dtable->fieldList['end']['name']     = 'end';
-$config->block->execution->dtable->fieldList['end']['title']    = $lang->execution->end;
-$config->block->execution->dtable->fieldList['end']['type']     = 'date';
-$config->block->execution->dtable->fieldList['end']['sortType'] = true;
+$config->block->execution->dtable->fieldList['end']['name']  = 'end';
+$config->block->execution->dtable->fieldList['end']['title'] = $lang->execution->end;
+$config->block->execution->dtable->fieldList['end']['type']  = 'date';
+$config->block->execution->dtable->fieldList['end']['sort']  = 'date';
 
 $config->block->execution->dtable->fieldList['status']['name']      = 'status';
 $config->block->execution->dtable->fieldList['status']['title']     = $lang->execution->status;
 $config->block->execution->dtable->fieldList['status']['type']      = 'status';
 $config->block->execution->dtable->fieldList['status']['statusMap'] = $lang->execution->statusList;
+$config->block->execution->dtable->fieldList['status']['sort']      = true;
 
-$config->block->execution->dtable->fieldList['totalEstimate']['name']     = 'totalEstimate';
-$config->block->execution->dtable->fieldList['totalEstimate']['title']    = $lang->execution->totalEstimate;
-$config->block->execution->dtable->fieldList['totalEstimate']['type']     = 'number';
-$config->block->execution->dtable->fieldList['totalEstimate']['sortType'] = true;
+$config->block->execution->dtable->fieldList['totalEstimate']['name']  = 'totalEstimate';
+$config->block->execution->dtable->fieldList['totalEstimate']['title'] = $lang->execution->totalEstimate;
+$config->block->execution->dtable->fieldList['totalEstimate']['type']  = 'number';
+$config->block->execution->dtable->fieldList['totalEstimate']['sort']  = 'number';
 
-$config->block->execution->dtable->fieldList['totalConsumed']['name']     = 'totalConsumed';
-$config->block->execution->dtable->fieldList['totalConsumed']['title']    = $lang->execution->totalConsumed;
-$config->block->execution->dtable->fieldList['totalConsumed']['type']     = 'number';
-$config->block->execution->dtable->fieldList['totalConsumed']['sortType'] = true;
+$config->block->execution->dtable->fieldList['totalConsumed']['name']  = 'totalConsumed';
+$config->block->execution->dtable->fieldList['totalConsumed']['title'] = $lang->execution->totalConsumed;
+$config->block->execution->dtable->fieldList['totalConsumed']['type']  = 'number';
+$config->block->execution->dtable->fieldList['totalConsumed']['sort']  = 'number';
 
-$config->block->execution->dtable->fieldList['progress']['name']     = 'progress';
-$config->block->execution->dtable->fieldList['progress']['title']    = $lang->execution->progress;
-$config->block->execution->dtable->fieldList['progress']['type']     = 'progress';
-$config->block->execution->dtable->fieldList['progress']['sortType'] = true;
+$config->block->execution->dtable->fieldList['progress']['name']  = 'progress';
+$config->block->execution->dtable->fieldList['progress']['title'] = $lang->execution->progress;
+$config->block->execution->dtable->fieldList['progress']['type']  = 'progress';
+$config->block->execution->dtable->fieldList['progress']['sort']  = 'number';
 
-$config->block->execution->dtable->fieldList['burns']['name']     = 'burns';
-$config->block->execution->dtable->fieldList['burns']['title']    = $lang->execution->burn;
-$config->block->execution->dtable->fieldList['burns']['type']     = 'burn';
-$config->block->execution->dtable->fieldList['burns']['sortType'] = true;
+$config->block->execution->dtable->fieldList['burns']['name']  = 'burns';
+$config->block->execution->dtable->fieldList['burns']['title'] = $lang->execution->burn;
+$config->block->execution->dtable->fieldList['burns']['type']  = 'burn';
+$config->block->execution->dtable->fieldList['burns']['sort']  = false;