This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch 4.15
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.15 by this push:
new 575e18c ui: Restored the Basic Networking (#4882)
575e18c is described below
commit 575e18c00af80f15f2cfb7d19bea06d086dc9779
Author: Hoang Nguyen <[email protected]>
AuthorDate: Thu Apr 1 16:01:57 2021 +0700
ui: Restored the Basic Networking (#4882)
* zone wizard: restored the basic networking
* set enabled Basic Networking
---
ui/public/config.json | 3 ++-
ui/src/views/infra/zone/ZoneWizardZoneTypeStep.vue | 15 ++++++++++++---
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/ui/public/config.json b/ui/public/config.json
index 45cc974..9f3b723 100644
--- a/ui/public/config.json
+++ b/ui/public/config.json
@@ -47,5 +47,6 @@
"sc": "label.simplified.chinese.keyboard"
},
"docHelpMappings": {},
- "plugins": []
+ "plugins": [],
+ "basicZoneEnabled": true
}
diff --git a/ui/src/views/infra/zone/ZoneWizardZoneTypeStep.vue
b/ui/src/views/infra/zone/ZoneWizardZoneTypeStep.vue
index 722df4f..72b4a60 100644
--- a/ui/src/views/infra/zone/ZoneWizardZoneTypeStep.vue
+++ b/ui/src/views/infra/zone/ZoneWizardZoneTypeStep.vue
@@ -30,10 +30,18 @@
initialValue: zoneType
}]
}]">
+ <a-card :gutter="12" class="card-item"
v-if="$config.basicZoneEnabled">
+ <a-col :md="6" :lg="6">
+ <a-radio class="card-form-item" value="Basic">{{
$t('label.basic') }}</a-radio>
+ </a-col>
+ <a-col :md="18" :lg="18">
+ <a-card class="ant-form-text zone-support">{{
$t(zoneDescription.Basic) }}</a-card>
+ </a-col>
+ </a-card>
<a-card :gutter="12" class="card-item">
<a-col :md="6" :lg="6">
- <a-radio style="display: none;" class="card-form-item"
value="Advanced">{{ $t('label.advanced') }}</a-radio>
- <span style="margin-top: 20px" class="card-form-item">
+ <a-radio class="card-form-item" value="Advanced"
v-if="$config.basicZoneEnabled">{{ $t('label.advanced') }}</a-radio>
+ <span style="margin-top: 20px;" class="card-form-item" v-else>
<a-icon type="setting" style="margin-right: 10px" />
{{ $t('label.advanced') }}
</span>
@@ -86,6 +94,7 @@ export default {
wrapperCol: { span: 14 }
},
zoneDescription: {
+ Basic: 'message.desc.basic.zone',
Advanced: 'message.desc.advanced.zone',
SecurityGroups: 'message.advanced.security.group'
}
@@ -108,7 +117,7 @@ export default {
return this.zoneType === 'Advanced'
},
zoneType () {
- return this.prefillContent.zoneType ? this.prefillContent.zoneType.value
: 'Advanced'
+ return this.prefillContent.zoneType ? this.prefillContent.zoneType.value
: (this.$config.basicZoneEnabled ? 'Basic' : 'Advanced')
},
securityGroupsEnabled () {
return this.isAdvancedZone && (this.prefillContent.securityGroupsEnabled
? this.prefillContent.securityGroupsEnabled.value : false)
