From 6eaecded47b83e6b6f2d550307060d86385a2f8b Mon Sep 17 00:00:00 2001 From: liyang Date: Mon, 19 Feb 2024 08:41:01 +0800 Subject: [PATCH] * Fix Bug #45920. --- module/gitea/config/form.php | 3 ++- module/gitlab/config/form.php | 3 ++- module/gogs/config/form.php | 3 ++- module/instance/config/form.php | 1 + module/jenkins/config/form.php | 3 ++- module/pipeline/model.php | 4 +++- module/sonarqube/config/form.php | 3 ++- module/space/ui/createapplication.html.php | 2 +- 8 files changed, 15 insertions(+), 7 deletions(-) diff --git a/module/gitea/config/form.php b/module/gitea/config/form.php index 5aa46093c8..a483bae20a 100644 --- a/module/gitea/config/form.php +++ b/module/gitea/config/form.php @@ -2,7 +2,8 @@ global $app; $config->gitea->form = new stdclass(); $config->gitea->form->create = array(); -$config->gitea->form->create['type'] = array('type' => 'string', 'required' => true, 'default' => 'gitea'); +$config->gitea->form->create['appType'] = array('type' => 'string', 'required' => true, 'default' => 'gitea'); +$config->gitea->form->create['type'] = array('type' => 'string', 'required' => true, 'default' => 'external'); $config->gitea->form->create['name'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim'); $config->gitea->form->create['url'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim'); $config->gitea->form->create['token'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim'); diff --git a/module/gitlab/config/form.php b/module/gitlab/config/form.php index 311e1b87b4..c43abd9fac 100644 --- a/module/gitlab/config/form.php +++ b/module/gitlab/config/form.php @@ -2,7 +2,8 @@ global $app; $config->gitlab->form = new stdclass(); $config->gitlab->form->create = array(); -$config->gitlab->form->create['type'] = array('type' => 'string', 'required' => true, 'default' => 'gitlab'); +$config->gitlab->form->create['appType'] = array('type' => 'string', 'required' => true, 'default' => 'gitlab'); +$config->gitlab->form->create['type'] = array('type' => 'string', 'required' => true, 'default' => 'external'); $config->gitlab->form->create['name'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim'); $config->gitlab->form->create['url'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim'); $config->gitlab->form->create['token'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim'); diff --git a/module/gogs/config/form.php b/module/gogs/config/form.php index 1c64fd6013..25e8916ee0 100644 --- a/module/gogs/config/form.php +++ b/module/gogs/config/form.php @@ -2,7 +2,8 @@ global $app; $config->gogs->form = new stdclass(); $config->gogs->form->create = array(); -$config->gogs->form->create['type'] = array('type' => 'string', 'required' => true, 'default' => 'gogs'); +$config->gogs->form->create['appType'] = array('type' => 'string', 'required' => true, 'default' => 'gogs'); +$config->gogs->form->create['type'] = array('type' => 'string', 'required' => true, 'default' => 'external'); $config->gogs->form->create['name'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim'); $config->gogs->form->create['url'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim'); $config->gogs->form->create['token'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim'); diff --git a/module/instance/config/form.php b/module/instance/config/form.php index e18ad079a7..c25da1481f 100644 --- a/module/instance/config/form.php +++ b/module/instance/config/form.php @@ -2,6 +2,7 @@ global $app; $config->instance->form = new stdclass(); $config->instance->form->create = array(); +$config->instance->form->create['appType'] = array('type' => 'string', 'required' => true, 'default' => ''); $config->instance->form->create['name'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim'); $config->instance->form->create['url'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim'); $config->instance->form->create['account'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim'); diff --git a/module/jenkins/config/form.php b/module/jenkins/config/form.php index b6abc58de4..a14c156a54 100644 --- a/module/jenkins/config/form.php +++ b/module/jenkins/config/form.php @@ -3,7 +3,8 @@ global $app; $config->jenkins->form = new stdclass(); $config->jenkins->form->create = array(); -$config->jenkins->form->create['type'] = array('type' => 'string', 'required' => true, 'default' => 'jenkins'); +$config->jenkins->form->create['appType'] = array('type' => 'string', 'required' => true, 'default' => 'jenkins'); +$config->jenkins->form->create['type'] = array('type' => 'string', 'required' => true, 'default' => 'external'); $config->jenkins->form->create['name'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim'); $config->jenkins->form->create['url'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim'); $config->jenkins->form->create['account'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim'); diff --git a/module/pipeline/model.php b/module/pipeline/model.php index dae365d22d..abd4f3f12a 100644 --- a/module/pipeline/model.php +++ b/module/pipeline/model.php @@ -102,7 +102,9 @@ class pipelineModel extends model */ public function create(object $server): int|false { - $type = $server->type; + $type = $server->appType; + $server->type = $type; + unset($server->appType); $server->url = rtrim($server->url, '/'); if(isset($server->password)) $server->password = base64_encode($server->password); diff --git a/module/sonarqube/config/form.php b/module/sonarqube/config/form.php index f0caf879df..72df3c8284 100644 --- a/module/sonarqube/config/form.php +++ b/module/sonarqube/config/form.php @@ -2,7 +2,8 @@ global $app; $config->sonarqube->form = new stdclass(); $config->sonarqube->form->create = array(); -$config->sonarqube->form->create['type'] = array('type' => 'string', 'required' => true, 'default' => 'sonarqube'); +$config->sonarqube->form->create['appType'] = array('type' => 'string', 'required' => true, 'default' => 'sonarqube'); +$config->sonarqube->form->create['type'] = array('type' => 'string', 'required' => true, 'default' => 'external'); $config->sonarqube->form->create['name'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim'); $config->sonarqube->form->create['url'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim'); $config->sonarqube->form->create['account'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim'); diff --git a/module/space/ui/createapplication.html.php b/module/space/ui/createapplication.html.php index 8c89bba3f7..3babedbb9d 100644 --- a/module/space/ui/createapplication.html.php +++ b/module/space/ui/createapplication.html.php @@ -167,7 +167,7 @@ if($config->inQuickon) formPanel ( $config->inQuickon ? setClass('externalPanel hidden') : setClass('externalPanel'), - set::id('createAppForm'), + set::formID('createAppForm'), set::title($lang->space->install), set::url($this->createLink('gitlab', 'create')), set::actionsClass('w-2/3'),