From 38a7d7334ab0fee1a2b9c0b50024bf939bce31c2 Mon Sep 17 00:00:00 2001
From: leiyong <1549684884@qq.com>
Date: Thu, 9 Jun 2022 03:42:53 +0000
Subject: [PATCH] * Fix bug#23481,bug#23466.

---
 module/execution/control.php | 5 ++++-
 module/kanban/control.php    | 2 +-
 module/kanban/css/view.css   | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index ac8760f403..4bf8a363ec 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -115,6 +115,7 @@ class execution extends control
         $this->loadModel('datatable');
         $this->loadModel('setting');
         $this->loadModel('product');
+        $this->loadModel('user');
 
         if(common::hasPriv('execution', 'create')) $this->lang->TRActions = html::a($this->createLink('execution', 'create'), "<i class='icon icon-sm icon-plus'></i> " . $this->lang->execution->create, '', "class='btn btn-primary'");
 
@@ -211,6 +212,7 @@ class execution extends control
         /* team member pairs. */
         $memberPairs = array();
         foreach($this->view->teamMembers as $key => $member) $memberPairs[$key] = $member->realname;
+        $memberPairs = $this->user->processAccountSort($memberPairs);
 
         $showAllModule = isset($this->config->execution->task->allModule) ? $this->config->execution->task->allModule : '';
         $extra         = (isset($this->config->execution->task->allModule) && $this->config->execution->task->allModule == 1) ? 'allModule' : '';
@@ -227,7 +229,7 @@ class execution extends control
         $this->view->orderBy      = $orderBy;
         $this->view->browseType   = $browseType;
         $this->view->status       = $status;
-        $this->view->users        = $this->loadModel('user')->getPairs('noletter|all');
+        $this->view->users        = $this->user->getPairs('noletter|all');
         $this->view->param        = $param;
         $this->view->executionID  = $executionID;
         $this->view->execution    = $execution;
@@ -918,6 +920,7 @@ class execution extends control
         {
             $memberPairs[$key] = $member->realname;
         }
+        $memberPairs = $this->user->processAccountSort($memberPairs);
 
         /* Build the search form. */
         $actionURL = $this->createLink('execution', 'bug', "executionID=$executionID&productID=$productID&orderBy=$orderBy&build=$build&type=bysearch&queryID=myQueryID");
diff --git a/module/kanban/control.php b/module/kanban/control.php
index 1b83d01bfb..262ce042da 100644
--- a/module/kanban/control.php
+++ b/module/kanban/control.php
@@ -1606,7 +1606,7 @@ class kanban extends control
 
         $this->view->canEdit = $from == 'RDKanban' ? 0 : 1;
         $this->view->column  = $column;
-        $this->view->title   = $column->name . $this->lang->colon . $this->lang->kanban->setColumn;
+        $this->view->title   = $column->name . $this->lang->colon . $this->lang->kanban->editColumn;
         $this->display();
     }
 
diff --git a/module/kanban/css/view.css b/module/kanban/css/view.css
index 7d955d6ea4..9f917732a3 100644
--- a/module/kanban/css/view.css
+++ b/module/kanban/css/view.css
@@ -140,3 +140,4 @@
 #main > .container {padding: 0px 0px 0px 10px; margin: -10px 0px 0px 0px;}
 @media screen and (max-width: 1366px){#main > .container {padding: 0px 10px 0px 10px; margin: -10px 0px 0px 0px;}}
 .panel-body {padding: 0px;}
+#kanbanContainer {background: #efefef; box-shadow: none;}