Skip to content

Commit 895114b

Browse files
davidjumaniyadvr
authored andcommitted
Fixing calling templatefilter=all (#632)
Fixes #605 Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
1 parent 91cc0d1 commit 895114b

File tree

1 file changed

+7
-29
lines changed

1 file changed

+7
-29
lines changed

ui/src/views/compute/DeployVM.vue

Lines changed: 7 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1139,10 +1139,6 @@ export default {
11391139
this.templateLicenses = []
11401140
this.templateProperties = {}
11411141
this.updateTemplateParameters()
1142-
if (t.deployasis === true && !t.details && (!this.template || t.id !== this.template.id)) {
1143-
// Deploy as-is template without details detected, need to retrieve the template details
1144-
this.fetchTemplateDetails(t)
1145-
}
11461142
template = t
11471143
break
11481144
}
@@ -1484,23 +1480,6 @@ export default {
14841480
this.loading[name] = false
14851481
})
14861482
},
1487-
fetchTemplateDetails (template) {
1488-
api('listTemplates', {
1489-
templateFilter: 'all',
1490-
id: template.id,
1491-
details: 'all'
1492-
}).then(response => {
1493-
if (response && response.listtemplatesresponse) {
1494-
const items = response.listtemplatesresponse.template
1495-
if (items && items.length > 0) {
1496-
this.template.details = items[0].details
1497-
this.updateTemplateParameters()
1498-
}
1499-
}
1500-
}).catch(error => {
1501-
this.$notifyError(error)
1502-
})
1503-
},
15041483
fetchTemplates (templateFilter, params) {
15051484
const args = Object.assign({}, params)
15061485
if (args.keyword || args.category !== templateFilter) {
@@ -1509,7 +1488,7 @@ export default {
15091488
}
15101489
args.zoneid = _.get(this.zone, 'id')
15111490
args.templatefilter = templateFilter
1512-
args.details = 'min'
1491+
args.details = 'all'
15131492
15141493
return new Promise((resolve, reject) => {
15151494
api('listTemplates', args).then((response) => {
@@ -1728,13 +1707,12 @@ export default {
17281707
this.templateProperties = this.fetchTemplateProperties(this.template)
17291708
this.selectedTemplateConfiguration = {}
17301709
if (this.templateConfigurationExists) {
1731-
setTimeout(() => {
1732-
this.selectedTemplateConfiguration = this.templateConfigurations[0]
1733-
if ('templateConfiguration' in this.form.fieldsStore.fieldsMeta) {
1734-
this.updateFieldValue('templateConfiguration', this.selectedTemplateConfiguration.id)
1735-
}
1736-
this.updateComputeOffering(null) // reset as existing selection may be incompatible
1737-
}, 500)
1710+
this.selectedTemplateConfiguration = this.templateConfigurations[0]
1711+
this.handleTemplateConfiguration()
1712+
if ('templateConfiguration' in this.form.fieldsStore.fieldsMeta) {
1713+
this.updateFieldValue('templateConfiguration', this.selectedTemplateConfiguration.id)
1714+
}
1715+
this.updateComputeOffering(null) // reset as existing selection may be incompatible
17381716
}
17391717
}
17401718
},

0 commit comments

Comments
 (0)