From 8a6337405e1658aa1007fcb1edc4f45dc5abdd74 Mon Sep 17 00:00:00 2001
From: sunguangming <sunguangming@easycorp.ltd>
Date: Sat, 16 Dec 2023 16:08:34 +0800
Subject: [PATCH] * kanban: refactor ajaxLoadUsers().

---
 module/kanban/control.php     | 9 +++++----
 module/kanban/js/common.ui.js | 6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/module/kanban/control.php b/module/kanban/control.php
index 67c7db1227..70e24ae87c 100644
--- a/module/kanban/control.php
+++ b/module/kanban/control.php
@@ -1599,6 +1599,7 @@ class kanban extends control
     }
 
     /**
+     * 获取看板左上角下拉菜单。
      * Ajax get kanban menu.
      *
      * @param  int    $kanbanID
@@ -1607,7 +1608,7 @@ class kanban extends control
      * @access public
      * @return void
      */
-    public function ajaxGetDropMenu($kanbanID, $moduleName, $methodName)
+    public function ajaxGetDropMenu(int $kanbanID, string $moduleName, string $methodName)
     {
         $kanbanIdList = $this->kanban->getCanViewObjects();
         $spacePairs   = $this->kanban->getSpacePairs('showClosed');
@@ -1627,6 +1628,7 @@ class kanban extends control
     }
 
     /**
+     * 获取区域中的泳道。
      * Ajax get lanes by region id.
      *
      * @param  int    $regionID
@@ -1636,7 +1638,7 @@ class kanban extends control
      * @access public
      * @return string
      */
-    public function ajaxGetLanes($regionID, $type = 'all', $field = 'otherLane', $pageType = '')
+    public function ajaxGetLanes(int $regionID, string $type = 'all', string $field = 'otherLane', string $pageType = '')
     {
         $lanes = $this->kanban->getLanePairsByRegion($regionID, $type);
 
@@ -1654,12 +1656,11 @@ class kanban extends control
      *
      * @param  int    $spaceID
      * @param  string $field team|whitelist|owner
-     * @param  string $selectedUser
      * @param  string $space all|space
      * @access public
      * @return string
      */
-    public function ajaxLoadUsers($spaceID, $field = '', $selectedUser = '', $type = 'space')
+    public function ajaxLoadUsers(int $spaceID, string $field = '', string $type = 'space')
     {
         $space    = $this->kanban->getSpaceById($spaceID);
         $accounts = '';
diff --git a/module/kanban/js/common.ui.js b/module/kanban/js/common.ui.js
index e93cf50718..3f50bdd064 100644
--- a/module/kanban/js/common.ui.js
+++ b/module/kanban/js/common.ui.js
@@ -42,7 +42,7 @@ window.changeKanbanType = function()
 
 window.loadAllUsers = function()
 {
-    const link = $.createLink('kanban', 'ajaxLoadUsers', 'spaceID=0&field=owner&selectedUser=' + $('[name=owner]').val() + "&type=all");
+    const link = $.createLink('kanban', 'ajaxLoadUsers', 'spaceID=0&field=owner&type=all');
     $.getJSON(link, function(data)
     {
         $('[name=owner]').zui('picker').render({items: data});
@@ -54,7 +54,7 @@ window.changeKanbanSpace = function()
     const spaceID = $('[name=space]').val();
     if(spaceType == 'private')
     {
-        const url = $.createLink('kanban', 'ajaxLoadUsers', 'spaceID=' + spaceID + '&field=whitelist&selectedUser=' + $('[name^=whitelist]').val());
+        const url = $.createLink('kanban', 'ajaxLoadUsers', 'spaceID=' + spaceID + '&field=whitelist');
         $.getJSON(url, function(data)
         {
             $('[name^=whitelist]').zui('picker').render({items: data});
@@ -62,7 +62,7 @@ window.changeKanbanSpace = function()
     }
     else
     {
-        url = $.createLink('kanban', 'ajaxLoadUsers', 'spaceID=' + spaceID + '&field=owner&selectedUser=' + $('[name=owner]').val());
+        url = $.createLink('kanban', 'ajaxLoadUsers', 'spaceID=' + spaceID + '&field=owner');
         $.getJSON(url, function(data)
         {
             $('[name=owner]').zui('picker').render({items: data});