From 80bbce28aecd230860540ea5fa4f5d0b01e531bb Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Mon, 4 Jul 2022 15:58:16 +0800
Subject: [PATCH] * Finish task #59436,59435.

---
 module/gitlab/control.php              | 14 +++++++++++++-
 module/gitlab/js/createuser.js         | 18 +++++++++++++++++-
 module/gitlab/view/createuser.html.php |  1 +
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/module/gitlab/control.php b/module/gitlab/control.php
index 942567f049..e47bdb2f52 100644
--- a/module/gitlab/control.php
+++ b/module/gitlab/control.php
@@ -583,10 +583,22 @@ class gitlab extends control
             return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browseUser', "gitlabID=$gitlabID")));
         }
 
-        $userPairs = $this->loadModel('user')->getPairs('noclosed|noletter');
+        $users       = $this->loadModel('user')->getList();
+        $bindedUsers = $this->gitlab->getUserAccountIdPairs($gitlabID);
+        $userPairs   = array('' => '');
+        $userInfos   = array();
+        foreach($users as $key => $user)
+        {
+            if(!isset($bindedUsers[$user->account]))
+            {
+                $userPairs[$user->account] = $user->realname;
+                $userInfos[$user->account] = $user;
+            }
+        }
 
         $this->view->title     = $this->lang->gitlab->common . $this->lang->colon . $this->lang->gitlab->user->create;
         $this->view->userPairs = $userPairs;
+        $this->view->users     = $userInfos;
         $this->view->gitlabID  = $gitlabID;
         $this->display();
     }
diff --git a/module/gitlab/js/createuser.js b/module/gitlab/js/createuser.js
index b7407093da..6ca0c4809d 100644
--- a/module/gitlab/js/createuser.js
+++ b/module/gitlab/js/createuser.js
@@ -1,4 +1,20 @@
 $(document).ready(function()
 {
     setAvatar();
-});
\ No newline at end of file
+    $('#account').change(function()
+    {
+        var account = $(this).val();
+        var user    = users[account];
+        var name    = '';
+        var email   = '';
+        if(account && user)
+        {
+            name    = user.realname;
+            account = user.account;
+            email   = user.email;
+        }
+        $('#name').val(name);
+        $('#username').val(account);
+        $('#email').val(email);
+    })
+});
diff --git a/module/gitlab/view/createuser.html.php b/module/gitlab/view/createuser.html.php
index 0be85a7bae..5adf9ff875 100644
--- a/module/gitlab/view/createuser.html.php
+++ b/module/gitlab/view/createuser.html.php
@@ -11,6 +11,7 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<?php js::set('users', $users);?>
 <div id='mainContent' class='main-row'>
   <div class='main-col main-content'>
     <div class='center-block'>