apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 11:52:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

images: Bug fixes (#634)

Browse Source 
* 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

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
davidjumani 2020-08-31 13:27:44 +05:30 committed by Rohit Yadav
parent 3868e91f77
commit cada52b29a
8 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/src/config/section/image.js
View File

@ -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')
}

4
ui/src/config/section/storage.js
View File

@ -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 }

1
ui/src/locales/de_DE.json
View File

@ -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",

1
ui/src/locales/en.json
View File

@ -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",

1
ui/src/locales/hi.json
View File

@ -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 प्रमाणपत्र",

3
ui/src/views/compute/DeployVM.vue
View File

@ -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
})
})

6
ui/src/views/compute/wizard/ComputeSelection.vue
View File

@ -128,9 +128,9 @@ export default {
},
data () {
return {
cpuNumberInputValue: 1,
cpuSpeedInputValue: 1,
memoryInputValue: 1,
cpuNumberInputValue: 0,
cpuSpeedInputValue: 0,
memoryInputValue: 0,
errors: {
cpu: {
status: '',

13
ui/src/views/image/RegisterOrUploadTemplate.vue
View File

@ -338,30 +338,25 @@
{{ $t('label.isdynamicallyscalable') }}
</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') }}