You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ro...@apache.org on 2020/08/31 08:00:08 UTC
[cloudstack-primate] branch master updated: images: Bug fixes (#634)
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack-primate.git
The following commit(s) were added to refs/heads/master by this push:
new 5c694ad images: Bug fixes (#634)
5c694ad is described below
commit 5c694ade6ec495722407cc94c90b75da15f8043e
Author: davidjumani <dj...@gmail.com>
AuthorDate: Mon Aug 31 13:27:44 2020 +0530
images: Bug fixes (#634)
* Removing sshKeyEnabled from template details
* Hide cancel while deploying a vm
* Disabling rather than showing cancel
* Setting custom offerings to zero
Fixes #604
Also : Hide cance button while deploying a vm
---
src/config/section/image.js | 4 ++--
src/config/section/storage.js | 4 ++--
src/locales/de_DE.json | 1 -
src/locales/en.json | 1 -
src/locales/hi.json | 1 -
src/views/compute/DeployVM.vue | 3 +--
src/views/compute/wizard/ComputeSelection.vue | 6 +++---
src/views/image/RegisterOrUploadTemplate.vue | 13 ++++---------
8 files changed, 12 insertions(+), 21 deletions(-)
diff --git a/src/config/section/image.js b/src/config/section/image.js
index ad3a119..e36fafd 100644
--- a/src/config/section/image.js
+++ b/src/config/section/image.js
@@ -43,7 +43,7 @@ export default {
}
return fields
},
- details: ['name', 'id', 'displaytext', 'checksum', 'hypervisor', 'format', 'ostypename', 'size', 'isready', 'passwordenabled', 'sshkeyenabled', 'directdownload', 'deployasis', 'isextractable', 'isdynamicallyscalable', 'ispublic', 'isfeatured', 'crosszones', 'type', 'account', 'domain', 'created', 'url'],
+ details: ['name', 'id', 'displaytext', 'checksum', 'hypervisor', 'format', 'ostypename', 'size', 'isready', 'passwordenabled', 'directdownload', 'deployasis', 'isextractable', 'isdynamicallyscalable', 'ispublic', 'isfeatured', 'crosszones', 'type', 'account', 'domain', 'created', 'url'],
searchFilters: ['name', 'zoneid', 'tags'],
related: [{
name: 'vm',
@@ -92,7 +92,7 @@ export default {
record.isready
},
args: (record, store) => {
- var fields = ['name', 'displaytext', 'passwordenabled', 'sshkeyenabled', 'ostypeid', 'isdynamicallyscalable']
+ var fields = ['name', 'displaytext', 'passwordenabled', 'ostypeid', 'isdynamicallyscalable']
if (['Admin'].includes(store.userInfo.roletype)) {
fields.push('isrouting')
}
diff --git a/src/config/section/storage.js b/src/config/section/storage.js
index 7949061..4a7550b 100644
--- a/src/config/section/storage.js
+++ b/src/config/section/storage.js
@@ -200,7 +200,7 @@ export default {
((record.type === 'ROOT' && record.vmstate === 'Stopped') ||
(record.type !== 'ROOT' && !record.virtualmachineid && !['Allocated', 'Uploaded'].includes(record.state)))
},
- args: ['volumeid', 'name', 'displaytext', 'ostypeid', 'ispublic', 'isfeatured', 'isdynamicallyscalable', 'requireshvm', 'passwordenabled', 'sshkeyenabled'],
+ args: ['volumeid', 'name', 'displaytext', 'ostypeid', 'ispublic', 'isfeatured', 'isdynamicallyscalable', 'requireshvm', 'passwordenabled'],
mapping: {
volumeid: {
value: (record) => { return record.id }
@@ -271,7 +271,7 @@ export default {
label: 'label.create.template',
dataView: true,
show: (record) => { return record.state === 'BackedUp' },
- args: ['snapshotid', 'name', 'displaytext', 'ostypeid', 'ispublic', 'isfeatured', 'isdynamicallyscalable', 'requireshvm', 'passwordenabled', 'sshkeyenabled'],
+ args: ['snapshotid', 'name', 'displaytext', 'ostypeid', 'ispublic', 'isfeatured', 'isdynamicallyscalable', 'requireshvm', 'passwordenabled'],
mapping: {
snapshotid: {
value: (record) => { return record.id }
diff --git a/src/locales/de_DE.json b/src/locales/de_DE.json
index c941a38..9637a91 100644
--- a/src/locales/de_DE.json
+++ b/src/locales/de_DE.json
@@ -1919,7 +1919,6 @@
"label.srx.firewall": "Juniper SRX Firewall",
"label.ssh.key.pair.details": "SSH-Schlüsselpaardetails",
"label.ssh.key.pairs": "SSH-Schlüsselpaare",
-"label.sshkeyenabled": "SSH aktiviert",
"label.sshkeypair": "Neues SSH-Schlüsselpaar",
"label.sshkeypairs": "SSH Schlüsselpaare",
"label.sslcertificates": "SSL Zertifikate",
diff --git a/src/locales/en.json b/src/locales/en.json
index 37f2d49..791da76 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -1959,7 +1959,6 @@
"label.srx.firewall": "Juniper SRX Firewall",
"label.ssh.key.pair.details": "SSH Key Pair Details",
"label.ssh.key.pairs": "SSH Key Pairs",
-"label.sshkeyenabled": "SSH Enabled",
"label.sshkeypair": "New SSH Key Pair",
"label.sshkeypairs": "SSH keypairs",
"label.sslcertificates": "SSL Certificates",
diff --git a/src/locales/hi.json b/src/locales/hi.json
index b78b036..525fdff 100644
--- a/src/locales/hi.json
+++ b/src/locales/hi.json
@@ -412,7 +412,6 @@
"label.sourcenattype": "समर्थित स्रोत NAT प्रकार",
"label.specifyipranges": "IP पर्वतमाला निर्दिष्ट करें",
"label.specifyvlan": "वीएलएएन निर्दिष्ट करें",
-"label.sshkeyenabled": "SSH सक्षम",
"label.sshkeypair": "न्यू SSH कुंजी जोड़ी",
"label.sshkeypairs": "SSH keypairs",
"label.sslcert प्रमाणपत्र": "SSL प्रमाणपत्र",
diff --git a/src/views/compute/DeployVM.vue b/src/views/compute/DeployVM.vue
index 3ef06da..0a679dd 100644
--- a/src/views/compute/DeployVM.vue
+++ b/src/views/compute/DeployVM.vue
@@ -505,7 +505,7 @@
</a-steps>
<div class="card-footer">
<!-- ToDo extract as component -->
- <a-button @click="() => this.$router.back()" :loading="loading.deploy">
+ <a-button @click="() => this.$router.back()" :disabled="loading.deploy">
{{ this.$t('label.cancel') }}
</a-button>
<a-button type="primary" @click="handleSubmit" :loading="loading.deploy">
@@ -1411,7 +1411,6 @@ export default {
this.$router.back()
}).catch(error => {
this.$notifyError(error)
- }).finally(() => {
this.loading.deploy = false
})
})
diff --git a/src/views/compute/wizard/ComputeSelection.vue b/src/views/compute/wizard/ComputeSelection.vue
index 76aa5e8..46a9f73 100644
--- a/src/views/compute/wizard/ComputeSelection.vue
+++ b/src/views/compute/wizard/ComputeSelection.vue
@@ -128,9 +128,9 @@ export default {
},
data () {
return {
- cpuNumberInputValue: 1,
- cpuSpeedInputValue: 1,
- memoryInputValue: 1,
+ cpuNumberInputValue: 0,
+ cpuSpeedInputValue: 0,
+ memoryInputValue: 0,
errors: {
cpu: {
status: '',
diff --git a/src/views/image/RegisterOrUploadTemplate.vue b/src/views/image/RegisterOrUploadTemplate.vue
index d0b4689..64e6480 100644
--- a/src/views/image/RegisterOrUploadTemplate.vue
+++ b/src/views/image/RegisterOrUploadTemplate.vue
@@ -339,29 +339,24 @@
</a-checkbox>
</a-col>
<a-col :span="12">
- <a-checkbox value="sshkeyenabled">
- {{ $t('label.sshkeyenabled') }}
- </a-checkbox>
- </a-col>
- </a-row>
- <a-row>
- <a-col :span="12">
<a-checkbox value="ispublic">
{{ $t('label.ispublic') }}
</a-checkbox>
</a-col>
+ </a-row>
+ <a-row>
<a-col :span="12">
<a-checkbox value="isfeatured">
{{ $t('label.isfeatured') }}
</a-checkbox>
</a-col>
- </a-row>
- <a-row>
<a-col :span="12">
<a-checkbox value="requireshvm">
{{ $t('label.requireshvm') }}
</a-checkbox>
</a-col>
+ </a-row>
+ <a-row>
<a-col :span="12" v-if="$store.getters.userInfo.roletype === 'Admin'">
<a-checkbox value="isrouting">
{{ $t('label.isrouting') }}