diff --git a/module/gitlab/control.php b/module/gitlab/control.php index ef2be057cd..91816b3dae 100644 --- a/module/gitlab/control.php +++ b/module/gitlab/control.php @@ -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); */ diff --git a/module/group/packagemanager.php b/module/group/packagemanager.php index 769a37eeda..4e7d697571 100644 --- a/module/group/packagemanager.php +++ b/module/group/packagemanager.php @@ -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; diff --git a/module/install/js/app.js b/module/install/js/app.js index 412830bff9..b26f858b16 100644 --- a/module/install/js/app.js +++ b/module/install/js/app.js @@ -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) diff --git a/module/install/view/app.html.php b/module/install/view/app.html.php index 93b66b8294..babc5155db 100644 --- a/module/install/view/app.html.php +++ b/module/install/view/app.html.php @@ -31,6 +31,7 @@ category as $item): + if(in_array($item->name, array('analysis', 'artifact'))) array_unshift($item->choices, array('name' => '', 'version' => '')); if($item->name === 'pms') continue; ?>