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

* Add select version of create app page.

Browse Source
This commit is contained in:
zhaoke
2023-09-06 10:52:33 +08:00
parent 8b6dee18bf
commit f1a80801a2
3 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/space/control.php
+5 -1
View File
@@ -155,7 +155,11 @@ class space extends control
*/
public function getStoreAppInfo(int $appID)
{
$cloudApp = $this->loadModel('store')->getAppInfo($appID);
$cloudApp = $this->loadModel('store')->getAppInfo($appID);
$versionPairs = $this->store->getVersionPairs($appID);
$versionItems = array();
foreach($versionPairs as $k => $v) $versionItems[] = array('text' => $v, 'value' => $k);
$cloudApp->versionList = $versionItems;
return print(json_encode($cloudApp));
}
module/space/js/createapplication.ui.js
+12 -1
View File
@@ -108,7 +108,18 @@ function onChangeStoreAppType(event)
var app = JSON.parse(response);
$('#app_version').val(app.app_version);
$('#version').val(app.version);
if(showVersion === true)
{
$('#version').picker({items: app.versionList, name: 'version', required: true});
setTimeout(() =>
{
$('#version').picker('setValue', app.versionList[0].value);
}, 300);
}
else
{
$('#version').val(app.version);
}
if((app.dependencies.mysql && mysqlList) || (app.dependencies.postgresql && pgList))
{
$('div.dbType').removeClass('hidden');
module/space/ui/createapplication.html.php
+14 -13
View File
@@ -10,23 +10,24 @@ declare(strict_types=1);
*/
namespace zin;
jsVar('gitlabUrlTips', $lang->gitlab->placeholder->url);
jsVar('gitlabTokenTips', $lang->gitlab->placeholder->token);
jsVar('sonarqubeUrlTips', $lang->sonarqube->placeholder->url);
jsVar('sonarqubeAccountTips', $lang->sonarqube->placeholder->account);
jsVar('jenkinsTokenTips', $lang->jenkins->tokenFirst);
jsVar('jenkinsPasswordTips', $lang->jenkins->tips);
jsVar('apps', $apps);
jsVar('mysqlList', $mysqlList);
jsVar('pgList', $pgList);
jsVar('defaultApp', $defaultApp);
jsVar('appID', $appID);
jsVar('externalApps', $config->space->zentaoApps);
$showVersion = getenv('ALLOW_SELECT_VERSION') && (strtolower(getenv('ALLOW_SELECT_VERSION')) == 'true' || strtolower(getenv('ALLOW_SELECT_VERSION')) == '1');
$dbTypeItems = array();
foreach($lang->instance->dbTypes as $type => $db) $dbTypeItems[] = array('text' => $db, 'value' => $type);
jsVar('gitlabUrlTips', $lang->gitlab->placeholder->url);
jsVar('gitlabTokenTips', $lang->gitlab->placeholder->token);
jsVar('sonarqubeUrlTips', $lang->sonarqube->placeholder->url);
jsVar('jenkinsTokenTips', $lang->jenkins->tokenFirst);
jsVar('jenkinsPasswordTips', $lang->jenkins->tips);
jsVar('sonarqubeAccountTips', $lang->sonarqube->placeholder->account);
jsVar('apps', $apps);
jsVar('appID', $appID);
jsVar('pgList', $pgList);
jsVar('mysqlList', $mysqlList);
jsVar('defaultApp', $defaultApp);
jsVar('showVersion', $showVersion);
jsVar('externalApps', $config->space->zentaoApps);
if($config->inQuickon)
{
formPanel