From 9eac41d7e31209e99b00701c9e67c2aa1f3ad674 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Mon, 10 Oct 2022 10:36:39 +0800
Subject: [PATCH] * Finish task #71895.

---
 module/task/config.php | 98 +++++++++++++++++++++---------------------
 1 file changed, 49 insertions(+), 49 deletions(-)

diff --git a/module/task/config.php b/module/task/config.php
index b0bca1614c..b458e3a55e 100644
--- a/module/task/config.php
+++ b/module/task/config.php
@@ -51,7 +51,7 @@ $config->task->custom->batchEditFields   = 'module,assignedTo,status,pri,estimat
 $config->task->excludeCheckFileds = ',pri,estStartedDitto,deadlineDitto,parent,regions,lanes,vision,region,';
 
 $config->task->datatable = new stdclass();
-$config->task->datatable->defaultField = array('id', 'pri', 'name', 'status', 'assignedTo', 'finishedBy', 'estimate', 'consumed', 'left', 'progress', 'deadline', 'actions');
+$config->task->datatable->defaultField = array('id', 'name', 'pri', 'assignedTo', 'status', 'finishedBy', 'deadline', 'estimate', 'consumed', 'left', 'progress', 'actions');
 
 global $lang;
 $config->task->datatable->fieldList['id']['title']    = 'idAB';
@@ -59,19 +59,10 @@ $config->task->datatable->fieldList['id']['fixed']    = 'left';
 $config->task->datatable->fieldList['id']['width']    = '70';
 $config->task->datatable->fieldList['id']['required'] = 'yes';
 
-$config->task->datatable->fieldList['module']['title']      = 'idAB';
-$config->task->datatable->fieldList['module']['control']    = 'select';
-$config->task->datatable->fieldList['module']['dataSource'] = array('module' => 'tree', 'method' => 'getTaskOptionMenu', 'params' => '$executionID');
-
-$config->task->datatable->fieldList['execution']['title']      = 'idAB';
-$config->task->datatable->fieldList['execution']['control']    = 'hidden';
-$config->task->datatable->fieldList['execution']['dataSource'] = array('module' => 'execution', 'method' => 'getPairs');
-
-$config->task->datatable->fieldList['mode']['title']   = 'idAB';
-$config->task->datatable->fieldList['mode']['control'] = 'hidden';
-
-$config->task->datatable->fieldList['desc']['title']   = 'idAB';
-$config->task->datatable->fieldList['desc']['control'] = 'textarea';
+$config->task->datatable->fieldList['name']['title']    = 'name';
+$config->task->datatable->fieldList['name']['fixed']    = 'left';
+$config->task->datatable->fieldList['name']['width']    = 'auto';
+$config->task->datatable->fieldList['name']['required'] = 'yes';
 
 $config->task->datatable->fieldList['pri']['title']    = 'priAB';
 $config->task->datatable->fieldList['pri']['fixed']    = 'left';
@@ -79,10 +70,17 @@ $config->task->datatable->fieldList['pri']['width']    = '35';
 $config->task->datatable->fieldList['pri']['required'] = 'no';
 $config->task->datatable->fieldList['pri']['name']     = $lang->task->pri;
 
-$config->task->datatable->fieldList['name']['title']    = 'name';
-$config->task->datatable->fieldList['name']['fixed']    = 'left';
-$config->task->datatable->fieldList['name']['width']    = 'auto';
-$config->task->datatable->fieldList['name']['required'] = 'yes';
+$config->task->datatable->fieldList['assignedTo']['title']      = 'assignedTo';
+$config->task->datatable->fieldList['assignedTo']['fixed']      = 'no';
+$config->task->datatable->fieldList['assignedTo']['width']      = '100';
+$config->task->datatable->fieldList['assignedTo']['required']   = 'no';
+$config->task->datatable->fieldList['assignedTo']['control']    = 'select';
+$config->task->datatable->fieldList['assignedTo']['dataSource'] = array('module' => 'user', 'method' => 'getTeamMemberPairs', 'params' => '$executionID&execution');
+
+$config->task->datatable->fieldList['assignedDate']['title']    = 'assignedDate';
+$config->task->datatable->fieldList['assignedDate']['fixed']    = 'no';
+$config->task->datatable->fieldList['assignedDate']['width']    = '110';
+$config->task->datatable->fieldList['assignedDate']['required'] = 'no';
 
 $config->task->datatable->fieldList['type']['title']    = 'typeAB';
 $config->task->datatable->fieldList['type']['fixed']    = 'no';
@@ -94,18 +92,17 @@ $config->task->datatable->fieldList['status']['fixed']    = 'no';
 $config->task->datatable->fieldList['status']['width']    = '60';
 $config->task->datatable->fieldList['status']['required'] = 'no';
 
-$config->task->datatable->fieldList['assignedTo']['title']      = 'assignedTo';
-$config->task->datatable->fieldList['assignedTo']['fixed']      = 'no';
-$config->task->datatable->fieldList['assignedTo']['width']      = '100';
-$config->task->datatable->fieldList['assignedTo']['required']   = 'no';
-$config->task->datatable->fieldList['assignedTo']['control']    = 'select';
-$config->task->datatable->fieldList['assignedTo']['dataSource'] = array('module' => 'user', 'method' => 'getTeamMemberPairs', 'params' => '$executionID&execution');
-
 $config->task->datatable->fieldList['finishedBy']['title']    = 'finishedByAB';
 $config->task->datatable->fieldList['finishedBy']['fixed']    = 'no';
 $config->task->datatable->fieldList['finishedBy']['width']    = '80';
 $config->task->datatable->fieldList['finishedBy']['required'] = 'no';
 
+$config->task->datatable->fieldList['deadline']['title']    = 'deadlineAB';
+$config->task->datatable->fieldList['deadline']['fixed']    = 'no';
+$config->task->datatable->fieldList['deadline']['width']    = '65';
+$config->task->datatable->fieldList['deadline']['required'] = 'no';
+$config->task->datatable->fieldList['deadline']['control'] = 'date';
+
 $config->task->datatable->fieldList['estimate']['title']    = 'estimateAB';
 $config->task->datatable->fieldList['estimate']['fixed']    = 'no';
 $config->task->datatable->fieldList['estimate']['width']    = '55';
@@ -128,12 +125,6 @@ $config->task->datatable->fieldList['progress']['required'] = 'no';
 $config->task->datatable->fieldList['progress']['sort']     = 'no';
 $config->task->datatable->fieldList['progress']['name']     = $lang->task->progress;
 
-$config->task->datatable->fieldList['deadline']['title']    = 'deadlineAB';
-$config->task->datatable->fieldList['deadline']['fixed']    = 'no';
-$config->task->datatable->fieldList['deadline']['width']    = '65';
-$config->task->datatable->fieldList['deadline']['required'] = 'no';
-$config->task->datatable->fieldList['deadline']['control'] = 'date';
-
 $config->task->datatable->fieldList['openedBy']['title']    = 'openedByAB';
 $config->task->datatable->fieldList['openedBy']['fixed']    = 'no';
 $config->task->datatable->fieldList['openedBy']['width']    = '90';
@@ -155,11 +146,6 @@ $config->task->datatable->fieldList['realStarted']['fixed']    = 'no';
 $config->task->datatable->fieldList['realStarted']['width']    = '95';
 $config->task->datatable->fieldList['realStarted']['required'] = 'no';
 
-$config->task->datatable->fieldList['assignedDate']['title']    = 'assignedDate';
-$config->task->datatable->fieldList['assignedDate']['fixed']    = 'no';
-$config->task->datatable->fieldList['assignedDate']['width']    = '110';
-$config->task->datatable->fieldList['assignedDate']['required'] = 'no';
-
 $config->task->datatable->fieldList['finishedDate']['title']    = 'finishedDateAB';
 $config->task->datatable->fieldList['finishedDate']['fixed']    = 'no';
 $config->task->datatable->fieldList['finishedDate']['width']    = '105';
@@ -191,19 +177,6 @@ $config->task->datatable->fieldList['closedReason']['width']      = '120';
 $config->task->datatable->fieldList['closedReason']['required']   = 'no';
 $config->task->datatable->fieldList['closedReason']['dataSource'] = array('lang' => 'reasonList');
 
-$config->task->datatable->fieldList['story']['title']      = "storyAB";
-$config->task->datatable->fieldList['story']['fixed']      = 'no';
-$config->task->datatable->fieldList['story']['width']      = '70';
-$config->task->datatable->fieldList['story']['required']   = 'no';
-$config->task->datatable->fieldList['story']['name']       = $lang->task->story;
-$config->task->datatable->fieldList['story']['control']    = 'select';
-$config->task->datatable->fieldList['story']['dataSource'] = array('module' => 'story', 'method' => 'getExecutionStories', 'params' => '$executionID', 'pairs' => array('id', 'title'));
-
-$config->task->datatable->fieldList['mailto']['title']    = 'mailto';
-$config->task->datatable->fieldList['mailto']['fixed']    = 'no';
-$config->task->datatable->fieldList['mailto']['width']    = '100';
-$config->task->datatable->fieldList['mailto']['required'] = 'no';
-
 $config->task->datatable->fieldList['lastEditedBy']['title']    = 'lastEditedBy';
 $config->task->datatable->fieldList['lastEditedBy']['fixed']    = 'no';
 $config->task->datatable->fieldList['lastEditedBy']['width']    = '95';
@@ -219,6 +192,33 @@ $config->task->datatable->fieldList['activatedDate']['fixed']    = 'no';
 $config->task->datatable->fieldList['activatedDate']['width']    = '90';
 $config->task->datatable->fieldList['activatedDate']['required'] = 'no';
 
+$config->task->datatable->fieldList['story']['title']      = "storyAB";
+$config->task->datatable->fieldList['story']['fixed']      = 'no';
+$config->task->datatable->fieldList['story']['width']      = '70';
+$config->task->datatable->fieldList['story']['required']   = 'no';
+$config->task->datatable->fieldList['story']['name']       = $lang->task->story;
+$config->task->datatable->fieldList['story']['control']    = 'select';
+$config->task->datatable->fieldList['story']['dataSource'] = array('module' => 'story', 'method' => 'getExecutionStories', 'params' => '$executionID', 'pairs' => array('id', 'title'));
+
+$config->task->datatable->fieldList['mailto']['title']    = 'mailto';
+$config->task->datatable->fieldList['mailto']['fixed']    = 'no';
+$config->task->datatable->fieldList['mailto']['width']    = '100';
+$config->task->datatable->fieldList['mailto']['required'] = 'no';
+
+$config->task->datatable->fieldList['module']['title']      = 'idAB';
+$config->task->datatable->fieldList['module']['control']    = 'select';
+$config->task->datatable->fieldList['module']['dataSource'] = array('module' => 'tree', 'method' => 'getTaskOptionMenu', 'params' => '$executionID');
+
+$config->task->datatable->fieldList['execution']['title']      = 'idAB';
+$config->task->datatable->fieldList['execution']['control']    = 'hidden';
+$config->task->datatable->fieldList['execution']['dataSource'] = array('module' => 'execution', 'method' => 'getPairs');
+
+$config->task->datatable->fieldList['mode']['title']   = 'idAB';
+$config->task->datatable->fieldList['mode']['control'] = 'hidden';
+
+$config->task->datatable->fieldList['desc']['title']   = 'idAB';
+$config->task->datatable->fieldList['desc']['control'] = 'textarea';
+
 $config->task->datatable->fieldList['actions']['title']    = 'actions';
 $config->task->datatable->fieldList['actions']['fixed']    = 'right';
 $config->task->datatable->fieldList['actions']['width']    = '180';