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

* Adjust bind user rule for gitea.

Browse Source
This commit is contained in:
caoyanyi
2023-12-21 19:48:57 +08:00
parent f22ebb5b42
commit 35a427a3bd
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/gitea/control.php
+1
View File
@@ -198,6 +198,7 @@ class gitea extends control
$user->status = 'notBind';
$user->giteaID = $giteaUser->id;
$user->giteaEmail = $giteaUser->email;
$user->giteaAccount = $giteaUser->account;
$user->giteaUser = $giteaUser->realname . '@' . $giteaUser->account;
$user->giteaUserAvatar = $giteaUser->avatar;
module/gitea/js/binduser.ui.js
+1 -1
View File
@@ -25,7 +25,7 @@ window.bindUser = function(e)
postData['giteaUserNames[]'] = [];
for(i in bindData)
{
postData['giteaUserNames[' + bindData[i].giteaID + ']'] = bindData[i].giteaUser;
postData['giteaUserNames[' + bindData[i].giteaID + ']'] = bindData[i].giteaAccount;
postData['zentaoUsers[' + bindData[i].giteaID + ']'] = formData['zentaoUsers[' + bindData[i].giteaID + ']'];
}
module/gitea/model.php
+2 -2
View File
@@ -90,7 +90,7 @@ class giteaModel extends model
$user->providerID = $giteaID;
$user->providerType = 'gitea';
$user->account = $account;
$user->openID = $openID;
$user->openID = $giteaNames[$openID];
$this->dao->insert(TABLE_OAUTH)->data($user)->exec();
$this->action->create('giteauser', $giteaID, 'bind', '', $giteaNames[$openID]);
}
@@ -273,7 +273,7 @@ class giteaModel extends model
$userList = array();
foreach($users as $giteaUser)
{
if($onlyLinked && !isset($linkedUsers[$giteaUser->id])) continue;
if($onlyLinked && !isset($linkedUsers[$giteaUser->username])) continue;
$user = new stdclass();
$user->id = $giteaUser->id;