From 44e31923f730c6017568fee84fd01c8daac10d5a Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Fri, 26 Aug 2022 10:12:12 +0800
Subject: [PATCH] * Fix bug #26918.

---
 module/task/config.php | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/module/task/config.php b/module/task/config.php
index b14fdcb456..96ca1d4d79 100644
--- a/module/task/config.php
+++ b/module/task/config.php
@@ -71,9 +71,6 @@ $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['deadline']['title']   = 'idAB';
-$config->task->datatable->fieldList['deadline']['control'] = 'date';
-
 $config->task->datatable->fieldList['pri']['title']    = 'priAB';
 $config->task->datatable->fieldList['pri']['fixed']    = 'left';
 $config->task->datatable->fieldList['pri']['width']    = '50';
@@ -95,6 +92,18 @@ $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['estimate']['title']    = 'estimateAB';
 $config->task->datatable->fieldList['estimate']['fixed']    = 'no';
 $config->task->datatable->fieldList['estimate']['width']    = '60';
@@ -121,6 +130,7 @@ $config->task->datatable->fieldList['deadline']['title']    = 'deadlineAB';
 $config->task->datatable->fieldList['deadline']['fixed']    = 'no';
 $config->task->datatable->fieldList['deadline']['width']    = '70';
 $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';
@@ -143,23 +153,11 @@ $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['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['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['finishedDate']['title']    = 'finishedDateAB';
 $config->task->datatable->fieldList['finishedDate']['fixed']    = 'no';
 $config->task->datatable->fieldList['finishedDate']['width']    = '105';