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

* Fix bug #39112.

Browse Source
This commit is contained in:
zhaoke
2023-10-07 08:50:45 +08:00
parent b5ffbedbc3
commit a21df2183d
5 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/instance/config.php
+1 -1
View File
@@ -59,4 +59,4 @@ $config->instance->actions->view = array();
$config->instance->actions->view['mainActions'] = array('visit', 'ajaxStart', 'ajaxStop', 'upgrade');
$config->instance->actions->view['suffixActions'] = array('ajaxUninstall');
$config->instance->devopsApps = array(89 => 'gitea', 58 => 'gitlab', 59 => 'jenkins', 60 => 'sonarqube', 118 => 'nexus');
$config->instance->devopsApps = array('gitea', 'gitlab', 'jenkins', 'sonarqube', 'nexus');
module/instance/control.php
+1 -1
View File
@@ -133,7 +133,7 @@ class instance extends control
$customItems = $this->cne->getCustomItems($instance);
if($instance->status == 'running') $this->instanceZen->saveAuthInfo($instance);
if(in_array(strtolower($instance->appName), $this->config->instance->devopsApps))
if(in_array($instance->chart, $this->config->instance->devopsApps))
{
$url = strstr(getWebRoot(true), ':', true) . '://' . $instance->domain;
$pipeline = $this->loadModel('pipeline')->getByUrl($url);
module/instance/model.php
+1 -1
View File
@@ -589,7 +589,7 @@ class InstanceModel extends model
$settingsMap->global->ingress->host = $settingsMap->ingress->host;
}
if(!empty($this->config->instance->devopsApps[$instance->appID]))
if(in_array($instance->chart, $this->config->instance->devopsApps))
{
$settingsMap->ci = new stdclass();
$settingsMap->ci->enabled = true;
module/instance/zen.php
+2 -2
View File
@@ -21,7 +21,7 @@ class instanceZen extends instance
*/
protected function saveAuthInfo(object $instance): void
{
if(empty($this->config->instance->devopsApps[$instance->appID])) return;
if(!in_array($instance->chart, $this->config->instance->devopsApps)) return;
$url = strstr(getWebRoot(true), ':', true) . '://' . $instance->domain;
$pipeline = $this->loadModel('pipeline')->getByUrl($url);
@@ -31,7 +31,7 @@ class instanceZen extends instance
if(empty($tempMappings)) return;
$pipeline = new stdclass();
$instance->type = $this->config->instance->devopsApps[$instance->appID];
$instance->type = $instance->chart;
$pipeline->type = $instance->type;
$pipeline->private = md5(strval(rand(10,113450)));
$pipeline->createdBy = 'system';
module/space/js/createapplication.ui.js
+3 -1
View File
@@ -88,6 +88,7 @@ function onChangeStoreAppType(event)
}
}
$('#createStoreAppForm').data('appid', storeApp);
$('#createStoreAppForm').attr('action', $.createLink('instance', 'install', 'appID=' + storeApp));
var storeAppName = apps[storeApp];
@@ -165,7 +166,8 @@ window.alertResource = function()
{
if(res)
{
$('#createStoreAppForm').attr('action', $('#createStoreAppForm').attr('action') + '&checkResource=false');
var appID = $('#createStoreAppForm').data('appid');
$('#createStoreAppForm').attr('action', $.createLink('instance', 'install', 'appID=' + appID + '&checkResource=false'));
$('#createStoreAppForm .form-row .toolbar button[type=submit]').trigger('click');
}
});