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

* Finish task#44804

Browse Source
This commit is contained in:
zenggang
2021-11-25 03:31:08 +00:00
parent 4b7d519ac5
commit e0cf5d56f4
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
module/gitlab/model.php
View File

@@ -2107,11 +2107,10 @@ class gitlabModel extends model
*/
public function editUser($gitlabID)
{
$user = fixer::input('post')->removeIF(!$this->post->password, 'password,password_repeat')->remove('avatar')->get();
$user = fixer::input('post')->remove('username')->removeIF(!$this->post->password, 'password,password_repeat')->remove('avatar')->get();
if(!empty($_FILES['avatar'])) $user->avatar = curl_file_create($_FILES['avatar']['tmp_name'], $_FILES['avatar']['type'], $_FILES['avatar']['name']);
if(empty($user->name)) dao::$errors['name'][] = $this->lang->gitlab->user->name . $this->lang->gitlab->user->emptyError;
if(empty($user->username)) dao::$errors['username'][] = $this->lang->gitlab->user->username . $this->lang->gitlab->user->emptyError;
if(empty($user->email)) dao::$errors['email'][] = $this->lang->gitlab->user->email . $this->lang->gitlab->user->emptyError;
if(dao::isError()) return false;
if(!empty($user->password) and $user->password != $user->password_repeat)

4
module/gitlab/view/edituser.html.php
View File

@@ -27,7 +27,7 @@
</tr>
<tr>
<th><?php echo $lang->gitlab->user->username;?></th>
<td class='required'><?php echo html::input('username', $user->username, "class='form-control' placeholder='{$lang->gitlab->user->username}'");?></td>
<td><?php echo html::input('username', $user->username, "readonly class='form-control' placeholder='{$lang->gitlab->user->username}'");?></td>
<td class="tips-git"></td>
</tr>
<tr>
@@ -62,7 +62,7 @@
<div class="checkbox-primary">
<input type="checkbox" name='external' id="external" value='1' <?php if($user->external) echo 'checked';?> /><label for="external" class="no-margin"><?php echo $lang->gitlab->user->externalTip; ?></label>
</div>
</td>
</td>
</tr>
<tr>
<th><?php echo $lang->gitlab->user->bind;?></th>