Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix bug #48903, adjust gitlab user create api params.

Browse Source
This commit is contained in:
caoyanyi
2024-05-07 16:26:24 +08:00
parent 32ae34bb86
commit 358ec99c1d
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/gitlab/config/form.php
+4 -4
View File
@@ -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();
module/gitlab/model.php
+1 -1
View File
@@ -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'));
}
/**