You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by an...@apache.org on 2020/09/16 09:17:43 UTC
[cloudstack-primate] branch master updated: vApps fix: use
deployasisdetails instead of details
This is an automated email from the ASF dual-hosted git repository.
andrijapanic 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 b3da6fd vApps fix: use deployasisdetails instead of details
new 62b19cb Merge pull request #710 from shapeblue/vapps-list-fix
b3da6fd is described below
commit b3da6fd596f93cbc772168cf301d0aa0dbe36e49
Author: nvazquez <ni...@gmail.com>
AuthorDate: Mon Sep 14 15:10:36 2020 -0300
vApps fix: use deployasisdetails instead of details
---
src/views/compute/DeployVM.vue | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/views/compute/DeployVM.vue b/src/views/compute/DeployVM.vue
index 7837be1..69b682c 100644
--- a/src/views/compute/DeployVM.vue
+++ b/src/views/compute/DeployVM.vue
@@ -1753,11 +1753,11 @@ export default {
},
fetchTemplateNics (template) {
var nics = []
- if (template && template.details && Object.keys(template.details).length > 0) {
- var keys = Object.keys(template.details)
- keys = keys.filter(key => key.startsWith('ACS-network-'))
+ if (template && template.deployasisdetails && Object.keys(template.deployasisdetails).length > 0) {
+ var keys = Object.keys(template.deployasisdetails)
+ keys = keys.filter(key => key.startsWith('network-'))
for (var key of keys) {
- var propertyMap = JSON.parse(template.details[key])
+ var propertyMap = JSON.parse(template.deployasisdetails[key])
nics.push(propertyMap)
}
nics.sort(function (a, b) {
@@ -1778,11 +1778,11 @@ export default {
},
fetchTemplateProperties (template) {
var properties = []
- if (template && template.details && Object.keys(template.details).length > 0) {
- var keys = Object.keys(template.details)
- keys = keys.filter(key => key.startsWith('ACS-property-'))
+ if (template && template.deployasisdetails && Object.keys(template.deployasisdetails).length > 0) {
+ var keys = Object.keys(template.deployasisdetails)
+ keys = keys.filter(key => key.startsWith('property-'))
for (var key of keys) {
- var propertyMap = JSON.parse(template.details[key])
+ var propertyMap = JSON.parse(template.deployasisdetails[key])
properties.push(propertyMap)
}
properties.sort(function (a, b) {
@@ -1793,11 +1793,11 @@ export default {
},
fetchTemplateConfigurations (template) {
var configurations = []
- if (template && template.details && Object.keys(template.details).length > 0) {
- var keys = Object.keys(template.details)
- keys = keys.filter(key => key.startsWith('ACS-configuration-'))
+ if (template && template.deployasisdetails && Object.keys(template.deployasisdetails).length > 0) {
+ var keys = Object.keys(template.deployasisdetails)
+ keys = keys.filter(key => key.startsWith('configuration-'))
for (var key of keys) {
- var configuration = JSON.parse(template.details[key])
+ var configuration = JSON.parse(template.deployasisdetails[key])
configuration.name = configuration.label
configuration.displaytext = configuration.label
configuration.iscustomized = true
@@ -1822,15 +1822,15 @@ export default {
},
fetchTemplateLicenses (template) {
var licenses = []
- if (template && template.details && Object.keys(template.details).length > 0) {
- var keys = Object.keys(template.details)
- const prefix = /ACS-eula-\d-/
- keys = keys.filter(key => key.startsWith('ACS-eula-')).sort()
+ if (template && template.deployasisdetails && Object.keys(template.deployasisdetails).length > 0) {
+ var keys = Object.keys(template.deployasisdetails)
+ const prefix = /eula-\d-/
+ keys = keys.filter(key => key.startsWith('eula-')).sort()
for (var key of keys) {
var license = {
id: this.escapePropertyKey(key.replace(' ', '-')),
name: key.replace(prefix, ''),
- text: template.details[key]
+ text: template.deployasisdetails[key]
}
licenses.push(license)
}