From 358ec99c1d35759eb20e47667cf184070dadf3f0 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Tue, 7 May 2024 16:25:42 +0800
Subject: [PATCH] * Fix bug #48903, adjust gitlab user create api params.

---
 module/gitlab/config/form.php | 8 ++++----
 module/gitlab/model.php       | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/module/gitlab/config/form.php b/module/gitlab/config/form.php
index 7066b3415c..5e311bf979 100644
--- a/module/gitlab/config/form.php
+++ b/module/gitlab/config/form.php
@@ -25,8 +25,8 @@ $config->gitlab->form->user->create['email']            = array('type' => 'strin
 $config->gitlab->form->user->create['password']         = array('type' => 'string', 'required' => false, 'default' => '');
 $config->gitlab->form->user->create['password_repeat']  = array('type' => 'string', 'required' => false, 'default' => '');
 $config->gitlab->form->user->create['projects_limit']   = array('type' => 'int', 'required' => false, 'default' => '100000');
-$config->gitlab->form->user->create['can_create_group'] = array('type' => 'string', 'required' => false, 'default' => '');
-$config->gitlab->form->user->create['external']         = array('type' => 'string', 'required' => false, 'default' => '');
+$config->gitlab->form->user->create['can_create_group'] = array('type' => 'bool', 'required' => false, 'default' => false);
+$config->gitlab->form->user->create['external']         = array('type' => 'bool', 'required' => false, 'default' => false);
 
 $config->gitlab->form->user->edit = array();
 $config->gitlab->form->user->edit['id']               = array('type' => 'int', 'required' => true);
@@ -37,8 +37,8 @@ $config->gitlab->form->user->edit['email']            = array('type' => 'string'
 $config->gitlab->form->user->edit['password']         = array('type' => 'string', 'required' => false, 'default' => '');
 $config->gitlab->form->user->edit['password_repeat']  = array('type' => 'string', 'required' => false, 'default' => '');
 $config->gitlab->form->user->edit['projects_limit']   = array('type' => 'int', 'required' => false, 'default' => '100000');
-$config->gitlab->form->user->edit['can_create_group'] = array('type' => 'string', 'required' => false, 'default' => '0');
-$config->gitlab->form->user->edit['external']         = array('type' => 'string', 'required' => false, 'default' => '0');
+$config->gitlab->form->user->edit['can_create_group'] = array('type' => 'bool', 'required' => false, 'default' => false);
+$config->gitlab->form->user->edit['external']         = array('type' => 'bool', 'required' => false, 'default' => false);
 
 $config->gitlab->form->group = new stdclass();
 
diff --git a/module/gitlab/model.php b/module/gitlab/model.php
index a76af060b6..d5ae6392dc 100644
--- a/module/gitlab/model.php
+++ b/module/gitlab/model.php
@@ -813,7 +813,7 @@ class gitlabModel extends model
 
         $apiRoot = $this->getApiRoot($gitlabID);
         $url     = sprintf($apiRoot, "/users");
-        return json_decode(commonModel::http($url, $user));
+        return json_decode(commonModel::http($url, $user, array(), array(), 'json'));
     }
 
     /**