From db4a3db53d819e32859b9dd333cefa11f1938a46 Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Mon, 27 Jul 2020 14:17:27 +0800
Subject: [PATCH]  * Finish task #7520;

---
 module/bug/control.php  | 30 ++++++++++--------------------
 module/bug/js/create.js | 41 ++++++++++++++---------------------------
 2 files changed, 24 insertions(+), 47 deletions(-)

diff --git a/module/bug/control.php b/module/bug/control.php
index 7d8d33071d..027ae7c08f 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -1406,8 +1406,16 @@ class bug extends control
      */
     public function ajaxGetModuleOwner($moduleID, $productID = 0)
     {
-        $owner = $this->bug->getModuleOwner($moduleID, $productID);
-        die($owner);
+        $account  = $this->bug->getModuleOwner($moduleID, $productID);
+        $realName = '';
+        if(!empty($account))
+        {
+            $user        = $this->dao->select('realname')->from(TABLE_USER)->where('account')->eq($account)->fetch();
+            $firstLetter = ucfirst(substr($account, 0, 1)) . ':';
+            if(!empty($this->config->isINT)) $firstLetter = '';
+            $realName = $firstLetter . ($user->realname ? $user->realname : $account);
+        }
+        die(json_encode(array($account, $realName)));
     }
 
     /**
@@ -1704,22 +1712,4 @@ class bug extends control
 
         die(json_encode(array('modules' => $modules, 'categories' => $type, 'versions' => $builds, 'severities' => $severity, 'priorities' => $pri)));
     }
-
-    /**
-     * AJAX: Get bug assigned title of a module.
-     *
-     * @param  string    $owner
-     * @access public
-     * @return string
-     */
-    public function ajaxGetModuleAssignedTitle($owner)
-    {
-        $user        = $this->dao->select('realname')->from(TABLE_USER)->where('account')->eq($owner)->fetch();
-        $firstLetter = ucfirst(substr($owner, 0, 1)) . ':';
-        if(!empty($this->config->isINT)) $firstLetter = '';
-        $title = $firstLetter . ($user->realname ? $user->realname : $owner);
-        die($title);
-    }
-
-
 }
diff --git a/module/bug/js/create.js b/module/bug/js/create.js
index d74c3d0261..5a12118e4a 100644
--- a/module/bug/js/create.js
+++ b/module/bug/js/create.js
@@ -26,16 +26,10 @@ function loadAllUsers()
   * @access public
   * @return void
   */
-function loadProjectTeamMembers(productID, selectedUser = '')
+function loadProjectTeamMembers(productID)
 {
-    selectedUser = selectedUser ? selectedUser : $('#assignedTo').val();
-    var link = createLink('bug', 'ajaxLoadProjectTeamMembers', 'productID=' + productID + '&selectedUser=' + selectedUser);
-    $.get(link, function(data)
-    {
-        $('#assignedTo_chosen').remove();
-        $('#assignedTo').replaceWith(data);
-        $('#assignedTo').chosen();
-    });
+    var link = createLink('bug', 'ajaxLoadProjectTeamMembers', 'productID=' + productID + '&selectedUser=' + $('#assignedTo').val());
+    $('#assignedToBox').load(link, function(){$('#assignedTo').chosen();});
 }
 
 /**
@@ -65,34 +59,27 @@ function setAssignedTo(moduleID, productID)
     var link = createLink('bug', 'ajaxGetModuleOwner', 'moduleID=' + moduleID + '&productID=' + productID);
     $.get(link, function(owner)
     {
-        var isExist = false;
-        var count = $('#assignedTo').find('option').length;
+        owner        = JSON.parse(owner);
+        var account  = owner[0];
+        var realName = owner[1];
+        var isExist  = false;
+        var count    = $('#assignedTo').find('option').length;
         for(var i=0;i<count;i++)
         {
-            if($('#assignedTo').get(0).options[i].value == owner)
+            if($('#assignedTo').get(0).options[i].value == account)
             {
                 isExist = true;
                 break;
             }
         }
-        if(!isExist)
+        if(!isExist && account)
         {
-            var titleLink = createLink('bug', 'ajaxGetModuleAssignedTitle', 'owner=' + owner);
-            $.get(titleLink, function(title)
-            {
-                option = "<option title='" + title + "' value='" + owner + "'>" + title + "</option>";
-                console.log(option,111);
-                $("#assignedTo").append(option);
-                $('#assignedTo').val(owner);
-                $("#assignedTo").trigger("chosen:updated");
-            });
+            option = "<option title='" + realName + "' value='" + account + "'>" + realName + "</option>";
+            $("#assignedTo").append(option);
         }
-        else
-        {
-            $('#assignedTo').val(owner);
-            $("#assignedTo").trigger("chosen:updated");
+        $('#assignedTo').val(account);
+        $("#assignedTo").trigger("chosen:updated");
 
-        }
     });
 }