From 3ea1dbb1dc9ac05afe46e589fcede50f0a0f5eba Mon Sep 17 00:00:00 2001 From: zhaoke Date: Thu, 3 Aug 2023 14:16:45 +0800 Subject: [PATCH] * Adjust save btn text of devops. --- lib/zin/wg/backbtn/v1.php | 2 ++ module/gitea/ui/edit.html.php | 2 ++ module/gitlab/ui/edit.html.php | 2 ++ module/gogs/ui/edit.html.php | 2 ++ module/jenkins/ui/edit.html.php | 2 ++ module/sonarqube/ui/edit.html.php | 2 ++ module/space/js/createapplication.ui.js | 4 ++-- module/space/ui/createapplication.html.php | 9 +++++---- module/store/js/browse.ui.js | 1 - module/store/model.php | 2 +- 10 files changed, 20 insertions(+), 8 deletions(-) diff --git a/lib/zin/wg/backbtn/v1.php b/lib/zin/wg/backbtn/v1.php index 8e53e04d60..9838f0c444 100644 --- a/lib/zin/wg/backbtn/v1.php +++ b/lib/zin/wg/backbtn/v1.php @@ -60,6 +60,8 @@ class backBtn extends btn 'mr' => 'mr-browse', 'repo' => 'repo-log,repo-browse', 'compile' => 'compile-browse', + 'store' => 'store-browse', + 'space' => 'store-browse', ); $props = parent::getProps(); diff --git a/module/gitea/ui/edit.html.php b/module/gitea/ui/edit.html.php index b2c3ba2d48..5e7745de69 100644 --- a/module/gitea/ui/edit.html.php +++ b/module/gitea/ui/edit.html.php @@ -16,6 +16,8 @@ formPanel ( set::id('giteaCreateForm'), set::title($lang->gitea->edit), + set::submitBtnText($lang->save), + set::actions(array('submit', array('text' => $lang->cancel, 'data-type' => 'submit', 'data-dismiss' => 'modal'))), formRow ( formGroup diff --git a/module/gitlab/ui/edit.html.php b/module/gitlab/ui/edit.html.php index 394dc90ba4..01222a2fe9 100644 --- a/module/gitlab/ui/edit.html.php +++ b/module/gitlab/ui/edit.html.php @@ -16,6 +16,8 @@ formPanel ( set::id('gitlabCreateForm'), set::title($lang->gitlab->edit), + set::submitBtnText($lang->save), + set::actions(array('submit', array('text' => $lang->cancel, 'data-type' => 'submit', 'data-dismiss' => 'modal'))), formRow ( formGroup diff --git a/module/gogs/ui/edit.html.php b/module/gogs/ui/edit.html.php index 6758c48491..7543d6ffaa 100644 --- a/module/gogs/ui/edit.html.php +++ b/module/gogs/ui/edit.html.php @@ -16,6 +16,8 @@ formPanel ( set::id('gogsCreateForm'), set::title($lang->gogs->edit), + set::submitBtnText($lang->save), + set::actions(array('submit', array('text' => $lang->cancel, 'data-type' => 'submit', 'data-dismiss' => 'modal'))), formRow ( formGroup diff --git a/module/jenkins/ui/edit.html.php b/module/jenkins/ui/edit.html.php index c8c49f98d0..99f4e5843c 100644 --- a/module/jenkins/ui/edit.html.php +++ b/module/jenkins/ui/edit.html.php @@ -16,6 +16,8 @@ formPanel ( set::id('jenkinsCreateForm'), set::title($lang->jenkins->edit), + set::submitBtnText($lang->save), + set::actions(array('submit', array('text' => $lang->cancel, 'data-type' => 'submit', 'data-dismiss' => 'modal'))), formRow ( formGroup diff --git a/module/sonarqube/ui/edit.html.php b/module/sonarqube/ui/edit.html.php index 7ba04ad7db..456c69f7a4 100644 --- a/module/sonarqube/ui/edit.html.php +++ b/module/sonarqube/ui/edit.html.php @@ -16,6 +16,8 @@ formPanel ( set::id('sonarqubeCreateForm'), set::title($lang->sonarqube->editServer), + set::submitBtnText($lang->save), + set::actions(array('submit', array('text' => $lang->cancel, 'data-type' => 'submit', 'data-dismiss' => 'modal'))), formRow ( formGroup diff --git a/module/space/js/createapplication.ui.js b/module/space/js/createapplication.ui.js index e0963cbe27..2a50b7f23f 100644 --- a/module/space/js/createapplication.ui.js +++ b/module/space/js/createapplication.ui.js @@ -6,13 +6,13 @@ function onChangeType(event) { $('.externalPanel').removeClass('hidden'); $('.storePanel').addClass('hidden'); - $('#typeexternal').prop('checked', true); + $('#type_external').prop('checked', true); } else { $('.storePanel').removeClass('hidden'); $('.externalPanel').addClass('hidden'); - $('#storetypestore').prop('checked', true); + $('#type_store').prop('checked', true); } } diff --git a/module/space/ui/createapplication.html.php b/module/space/ui/createapplication.html.php index b12368897d..48d19cf093 100644 --- a/module/space/ui/createapplication.html.php +++ b/module/space/ui/createapplication.html.php @@ -104,6 +104,8 @@ formPanel setClass('storePanel' . ($appID ? '' : ' hidden')), set::id('createStoreAppForm'), set::title($lang->space->install), + $appID ? set::submitBtnText($lang->instance->install) : null, + $appID ? set::actions(array('submit', array('text' => $lang->instance->stop, 'data-type' => 'submit', 'data-dismiss' => 'modal'))) : null, formRow ( setStyle('display', $appID ? 'block' : 'none'), @@ -113,7 +115,7 @@ formPanel set::label($lang->instance->name), set::name('customName'), set::control('input'), - set::value($apps[$appID]), + set::value($appID ? $apps[$appID] : ''), set::required(true), ) ), @@ -138,8 +140,8 @@ formPanel formGroup ( set::label($lang->space->addType), - set::name('storetype'), - set::value($addType), + set::name('type'), + set::value('store'), set::disabled(!!$appID), set::control('radioListInline'), set::items(array(array('text' => $lang->store->common, 'value' => 'store'), array('text' => $lang->space->handConfig, 'value' => 'external'))), @@ -224,4 +226,3 @@ formPanel ); render(); - diff --git a/module/store/js/browse.ui.js b/module/store/js/browse.ui.js index 9deed781b6..8f75b60084 100644 --- a/module/store/js/browse.ui.js +++ b/module/store/js/browse.ui.js @@ -32,7 +32,6 @@ window.treeClick = function(info) window.installApp = function() { var confirm = $(this).data('confirm'); - console.log(confirm); if(confirm) { zui.Modal.confirm(confirm).then(result => diff --git a/module/store/model.php b/module/store/model.php index 9f0f10fec4..b5f990a84e 100644 --- a/module/store/model.php +++ b/module/store/model.php @@ -142,7 +142,7 @@ class storeModel extends model $apiUrl = $this->config->cloud->api->host; $apiUrl .= '/api/market/app/version'; $result = commonModel::apiGet($apiUrl, $apiParams, $this->config->cloud->api->headers); - if(!isset($result->code) || $result->code != 200) return null; + if(!isset($result->code) || $result->code != 200) return array(); return array_combine(array_column($result->data, 'version'), $result->data); }