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

* Add empty option of install devops app.

Browse Source
This commit is contained in:
zhaoke
2023-09-27 17:19:01 +08:00
parent 35312dd07e
commit 87f2bfb26d
8 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/gitlab/control.php
+7 -4
View File
@@ -20,11 +20,14 @@ class gitlab extends control
{
parent::__construct($moduleName, $methodName);
if(!commonModel::hasPriv('space', 'browse')) $this->loadModel('common')->deny('space', 'browse', false);
if(!in_array(strtolower(strtolower($this->methodName)), array('browseproject', 'browsegroup', 'browseuser', 'browsebranch', 'browsetag')))
if(stripos($this->methodName, 'ajax') === false)
{
if(!commonModel::hasPriv('instance', 'manage')) $this->loadModel('common')->deny('instance', 'manage', false);
if(!commonModel::hasPriv('space', 'browse')) $this->loadModel('common')->deny('space', 'browse', false);
if(!in_array(strtolower(strtolower($this->methodName)), array('browseproject', 'browsegroup', 'browseuser', 'browsebranch', 'browsetag')))
{
if(!commonModel::hasPriv('instance', 'manage')) $this->loadModel('common')->deny('instance', 'manage', false);
}
}
/* This is essential when changing tab(menu) from gitlab to repo. */
/* Optional: common::setMenuVars('devops', $this->session->repoID); */
module/group/packagemanager.php
+2 -2
View File
@@ -2570,7 +2570,7 @@ $config->group->package->browseMR = new stdclass();
$config->group->package->browseMR->order = 5;
$config->group->package->browseMR->subset = 'mr';
$config->group->package->browseMR->privs = array();
$config->group->package->browseMR->privs['mr-browse'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 5, 'depend' => array('mr-accept'), 'recommend' => array('mr-addReview', 'mr-approval', 'mr-close', 'mr-create', 'mr-diff', 'mr-edit', 'mr-link', 'mr-linkBug', 'mr-linkStory', 'mr-linkTask', 'mr-reopen', 'mr-unlink', 'mr-view'));
$config->group->package->browseMR->privs['mr-browse'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 5, 'depend' => array('repo-maintain'), 'recommend' => array('mr-addReview', 'mr-approval', 'mr-close', 'mr-create', 'mr-diff', 'mr-edit', 'mr-link', 'mr-linkBug', 'mr-linkStory', 'mr-linkTask', 'mr-reopen', 'mr-unlink', 'mr-view'));
$config->group->package->browseMR->privs['mr-view'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 10, 'depend' => array('mr-accept'), 'recommend' => array('mr-diff', 'mr-link'));
$config->group->package->browseMR->privs['mr-diff'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 15, 'depend' => array('mr-accept'), 'recommend' => array('mr-link', 'mr-view'));
$config->group->package->browseMR->privs['mr-link'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 20, 'depend' => array('mr-accept'), 'recommend' => array('mr-diff', 'mr-view'));
@@ -3940,7 +3940,7 @@ $config->group->package->browseApplication = new stdclass();
$config->group->package->browseApplication->order = 2840;
$config->group->package->browseApplication->subset = 'app';
$config->group->package->browseApplication->privs = array();
$config->group->package->browseApplication->privs['space-browse'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 5, 'depend' => array('repo-maintain'), 'recommend' => array());
$config->group->package->browseApplication->privs['space-browse'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 5, 'depend' => array('repo-maintain'), 'recommend' => array());
$config->group->package->mangeApplication = new stdclass();
$config->group->package->mangeApplication->order = 2840;
module/install/js/app.js
+1 -1
View File
@@ -50,7 +50,7 @@ function checkMemory()
$.each(category, (index, cate) =>
{
var item = $('#' + cate).val();
apps.push(item);
if(item != '') apps.push(item);
});
$.post(createLink('install', 'ajaxCheck'), {apps: apps}).done(function(response)
module/install/view/app.html.php
+1
View File
@@ -31,6 +31,7 @@
</tr>
<?php
foreach($components->category as $item):
if(in_array($item->name, array('analysis', 'artifact'))) array_unshift($item->choices, array('name' => '', 'version' => ''));
if($item->name === 'pms') continue;
?>
<tr>
module/instance/control.php
-1
View File
@@ -701,7 +701,6 @@ class instance extends control
*/
public function ajaxStatus()
{
if(!commonModel::hasPriv('space', 'browse')) $this->loadModel('common')->deny('space', 'browse', false);
$postData = fixer::input('post')->setDefault('idList', array())->get();
$instances = $this->instance->getByIdList($postData->idList);
module/instance/zen.php
+1
View File
@@ -45,6 +45,7 @@ class instanceZen extends instance
if(empty($pipeline->account)) $pipeline->account = zget($tempMappings, 'admin_username', '');
$this->pipeline->create($pipeline);
if(dao::isError()) dao::getError();
}
/**
module/jenkins/control.php
+4 -1
View File
@@ -20,7 +20,10 @@ class jenkins extends control
public function __construct($moduleName = '', $methodName = '')
{
parent::__construct($moduleName, $methodName);
if(!commonModel::hasPriv('space', 'browse')) $this->loadModel('common')->deny('space', 'browse', false);
if(stripos($this->methodName, 'ajax') === false)
{
if(!commonModel::hasPriv('space', 'browse')) $this->loadModel('common')->deny('space', 'browse', false);
}
$this->loadModel('ci')->setMenu();
}
module/sonarqube/control.php
+8 -4
View File
@@ -20,12 +20,16 @@ class sonarqube extends control
{
parent::__construct($moduleName, $methodName);
if(!commonModel::hasPriv('space', 'browse')) $this->loadModel('common')->deny('space', 'browse', false);
if(!in_array(strtolower(strtolower($this->methodName)), array('browseproject', 'reportview', 'browseissue')))
if(stripos($this->methodName, 'ajax') === false)
{
if(!commonModel::hasPriv('instance', 'manage')) $this->loadModel('common')->deny('instance', 'manage', false);
if(!commonModel::hasPriv('space', 'browse')) $this->loadModel('common')->deny('space', 'browse', false);
if(!in_array(strtolower(strtolower($this->methodName)), array('browseproject', 'reportview', 'browseissue')))
{
if(!commonModel::hasPriv('instance', 'manage')) $this->loadModel('common')->deny('instance', 'manage', false);
}
}
/* This is essential when changing tab(menu) from gitlab to repo. */
/* Optional: common::setMenuVars('devops', $this->session->repoID); */
$this->loadModel('ci')->setMenu();