* Finish task #59436,59435.

2022-07-04 15:58:16 +08:00
parent 4bacc1b95f
commit 80bbce28ae
3 changed files with 31 additions and 2 deletions
@@ -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();
    }