Skip to content

Commit 6ffcf4f

Browse files
Nabassa1323Nabassa1323
authored andcommitted
ui: exclude SYSTEM/ROUTING templates from Deploy Instance (#14414)
1 parent d3f0700 commit 6ffcf4f

1 file changed

Lines changed: 16 additions & 1 deletion

File tree

‎ui/src/views/compute/DeployVM.vue‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2995,6 +2995,21 @@ export default {
29952995
}
29962996
this.fetchAllTemplates(params)
29972997
},
2998+
isDeployableUserTemplate (template) {
2999+
// System / routing templates must not appear in Deploy Instance (admins see them via templatefilter=all)
3000+
return template && template.templatetype !== 'SYSTEM' && template.templatetype !== 'ROUTING'
3001+
},
3002+
filterDeployableTemplates (listTemplatesResponse) {
3003+
if (_.isEmpty(listTemplatesResponse)) {
3004+
return { count: 0, template: [] }
3005+
}
3006+
const templates = (listTemplatesResponse.template || []).filter(this.isDeployableUserTemplate)
3007+
return {
3008+
...listTemplatesResponse,
3009+
template: templates,
3010+
count: templates.length
3011+
}
3012+
},
29983013
fetchAllTemplates (params) {
29993014
const promises = []
30003015
const templates = {}
@@ -3008,7 +3023,7 @@ export default {
30083023
this.options.templates = templates
30093024
return Promise.all(promises).then((response) => {
30103025
response.forEach((resItem, idx) => {
3011-
templates[templateFilters[idx]] = _.isEmpty(resItem.listtemplatesresponse) ? { count: 0, template: [] } : resItem.listtemplatesresponse
3026+
templates[templateFilters[idx]] = this.filterDeployableTemplates(resItem.listtemplatesresponse)
30123027
this.options.templates = { ...templates }
30133028
})
30143029
this.updateSelectedTemplateHypervisor()

0 commit comments

Comments
 (0)