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

* Fix bug#42611,42609

Browse Source
This commit is contained in:
zenggang
2023-12-28 02:44:57 +00:00
parent d891e3a64a
commit d78be17d87
11 changed files with 91 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/gitlab/control.php
+9 -25
View File
@@ -317,11 +317,7 @@ class gitlab extends control
*/
public function browseGroup(int $gitlabID, string $orderBy = 'name_asc')
{
if(!$this->app->user->admin)
{
$openID = $this->gitlab->getUserIDByZentaoAccount($gitlabID, $this->app->user->account);
if(!$openID) return print(js::alert($this->lang->gitlab->mustBindUser) . js::locate($this->createLink('gitlab', 'browse')));
}
if(!$this->app->user->admin) $this->gitlabZen->checkBindedUser($gitlabID);
$fixOrderBy = str_replace('fullName', 'name', $orderBy);
$keyword = fixer::input('post')->setDefault('keyword', '')->get('keyword');
@@ -351,11 +347,7 @@ class gitlab extends control
*/
public function createGroup(int $gitlabID)
{
if(!$this->app->user->admin)
{
$openID = $this->gitlab->getUserIDByZentaoAccount($gitlabID, $this->app->user->account);
if(!$openID) return print(js::alert($this->lang->gitlab->mustBindUser) . js::locate($this->createLink('gitlab', 'browse')));
}
if(!$this->app->user->admin) $this->gitlabZen->checkBindedUser($gitlabID);
if($_POST)
{
@@ -387,8 +379,7 @@ class gitlab extends control
{
if(!$this->app->user->admin)
{
$openID = $this->gitlab->getUserIDByZentaoAccount($gitlabID, $this->app->user->account);
if(!$openID) return print(js::alert($this->lang->gitlab->mustBindUser) . js::locate($this->createLink('space', 'browse')));
$this->gitlabZen->checkBindedUser($gitlabID);
$members = $this->gitlab->apiGetGroupMembers($gitlabID, $groupID, $openID);
if(empty($members) or $members[0]->access_level < $this->config->gitlab->accessLevel['owner']) return print(js::alert($this->lang->gitlab->noAccess) . js::locate($this->createLink('space', 'browse')));
@@ -522,8 +513,8 @@ class gitlab extends control
$isAdmin = true;
if(!$this->app->user->admin)
{
$userID = $this->gitlab->getUserIDByZentaoAccount($gitlabID, $this->app->user->account);
$user = $this->gitlab->apiGetSingleUser($gitlabID, $userID);
$userID = $this->loadModel('pipeline')->getOpenIdByAccount($gitlabID, 'gitlab', $this->app->user->account);
$user = $this->gitlab->apiGetSingleUser($gitlabID, (int)$userID);
if(!$user->is_admin) $isAdmin = false;
}
@@ -683,8 +674,7 @@ class gitlab extends control
$openID = 0;
if(!$this->app->user->admin)
{
$openID = $this->gitlab->getUserIDByZentaoAccount($gitlabID, $this->app->user->account);
if(!$openID) return print(js::alert($this->lang->gitlab->mustBindUser) . js::locate($this->createLink('space', 'browse')));
$this->gitlabZen->checkBindedUser($gitlabID);
}
$this->app->loadClass('pager', true);
@@ -927,11 +917,7 @@ class gitlab extends control
{
$project = $this->gitlab->apiGetSingleProject($gitlabID, $projectID);
if(!$this->app->user->admin)
{
$openID = $this->gitlab->getUserIDByZentaoAccount($gitlabID, $this->app->user->account);
if(!$openID) return print(js::alert($this->lang->gitlab->mustBindUser) . js::locate($this->createLink('gitlab', 'browse')));
}
if(!$this->app->user->admin) $this->gitlabZen->checkBindedUser($gitlabID);
$this->session->set('gitlabTagList', $this->app->getURI(true));
$keyword = fixer::input('post')->setDefault('keyword', '')->get('keyword');
@@ -1308,8 +1294,7 @@ class gitlab extends control
{
if(!$this->app->user->admin)
{
$openID = $this->gitlab->getUserIDByZentaoAccount($gitlabID, $this->app->user->account);
if(!$openID) return print(js::alert($this->lang->gitlab->mustBindUser) . js::locate($this->createLink('gitlab', 'browse')));
$this->gitlabZen->checkBindedUser($gitlabID);
$project = $this->gitlab->apiGetSingleProject($gitlabID, $projectID);
if(!$this->gitlab->checkUserAccess($gitlabID, $projectID, $project)) return print(js::alert($this->lang->gitlab->noAccess) . js::locate($this->createLink('gitlab', 'browse')));
@@ -1354,8 +1339,7 @@ class gitlab extends control
{
if(!$this->app->user->admin)
{
$openID = $this->gitlab->getUserIDByZentaoAccount($gitlabID, $this->app->user->account);
if(!$openID) return print(js::alert($this->lang->gitlab->mustBindUser) . js::locate($this->createLink('gitlab', 'browse')));
$this->gitlabZen->checkBindedUser($gitlabID);
$project = $this->gitlab->apiGetSingleProject($gitlabID, $projectID);
if(!$this->gitlab->checkUserAccess($gitlabID, $projectID, $project)) return print(js::alert($this->lang->gitlab->noAccess) . js::locate($this->createLink('gitlab', 'browse')));
module/gitlab/js/common.ui.js
+13
View File
@@ -26,3 +26,16 @@ function onAclChange(event)
if(visibility == 'public') $("#visibilitypublic").parent().append(publicTip);
if(visibility != 'public') $('#publicTip').remove();
}
/**
* Alert error and jump page.
*
* @param string $error
* @param string $errorJump
* @access public
* @return viod
*/
function alertJump(error, errorJump)
{
zui.Modal.alert(error).then((res) => {loadPage(errorJump)});
}
module/gitlab/ui/browsegroup.html.php
+6
View File
@@ -10,6 +10,12 @@ declare(strict_types=1);
*/
namespace zin;
if(!empty($permissionError))
{
jsCall('alertJump', array($permissionError, $errorJump));
return;
}
jsVar('gitlabUrl', $gitlab->url);
$canCreate = hasPriv('instance', 'manage');
module/gitlab/ui/browseproject.html.php
+6
View File
@@ -10,6 +10,12 @@ declare(strict_types=1);
*/
namespace zin;
if(!empty($permissionError))
{
jsCall('alertJump', array($permissionError, $errorJump));
return;
}
jsVar('projectStar', $lang->gitlab->project->star);
jsVar('projectFork', $lang->gitlab->project->fork);
module/gitlab/ui/browsetag.html.php
+6
View File
@@ -11,6 +11,12 @@ declare(strict_types=1);
namespace zin;
jsVar('protectedTag', $lang->gitlab->tag->protected);
if(!empty($permissionError))
{
jsCall('alertJump', array($permissionError, $errorJump));
return;
}
featureBar
(
backBtn
module/gitlab/ui/creategroup.html.php
+6
View File
@@ -10,6 +10,12 @@ declare(strict_types=1);
*/
namespace zin;
if(!empty($permissionError))
{
jsCall('alertJump', array($permissionError, $errorJump));
return;
}
$publicTip = "<span id='publicTip' class='text-danger'>" . $lang->gitlab->group->publicTip . '</span>';
jsVar('publicTip', $publicTip);
module/gitlab/ui/editgroup.html.php
+6
View File
@@ -10,6 +10,12 @@ declare(strict_types=1);
*/
namespace zin;
if(!empty($permissionError))
{
jsCall('alertJump', array($permissionError, $errorJump));
return;
}
$publicTip = "<span id='publicTip' class='text-danger'>" . $lang->gitlab->group->publicTip . '</span>';
jsVar('publicTip', $publicTip);
jsVar('visibility', $group->visibility);
module/gitlab/ui/managebranchpriv.html.php
+6
View File
@@ -10,6 +10,12 @@ declare(strict_types=1);
*/
namespace zin;
if(!empty($permissionError))
{
jsCall('alertJump', array($permissionError, $errorJump));
return;
}
jsVar('hasAccessBranches', $hasAccessBranches);
formBatchPanel
(
module/gitlab/ui/managetagpriv.html.php
+6
View File
@@ -10,6 +10,12 @@ declare(strict_types=1);
*/
namespace zin;
if(!empty($permissionError))
{
jsCall('alertJump', array($permissionError, $errorJump));
return;
}
jsVar('hasAccessTags', $hasAccessTags);
formBatchPanel
(
module/gitlab/zen.php
+18
View File
@@ -229,4 +229,22 @@ class gitlabZen extends gitlab
return array($addedMembers, $deletedMembers, $updatedMembers);
}
/**
* 检查是否绑定用户。
* Check has binded user.
*
* @param int $gitlabID
* @access protected
* @return void
*/
protected function checkBindedUser(int $gitlabID): void
{
$openID = $this->loadModel('pipeline')->getOpenIdByAccount($gitlabID, 'gitlab', $this->app->user->account);
if(!$openID)
{
$this->view->permissionError = $this->lang->gitlab->mustBindUser;
$this->view->errorJump = $this->createLink('space', 'browse');
}
}
}