Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion ui/src/views/compute/DeployVM.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2995,6 +2995,21 @@ export default {
}
this.fetchAllTemplates(params)
},
isDeployableUserTemplate (template) {
// System / routing templates must not appear in Deploy Instance (admins see them via templatefilter=all)
return template && template.templatetype !== 'SYSTEM' && template.templatetype !== 'ROUTING'
},
filterDeployableTemplates (listTemplatesResponse) {
if (_.isEmpty(listTemplatesResponse)) {
return { count: 0, template: [] }
}
const templates = (listTemplatesResponse.template || []).filter(this.isDeployableUserTemplate)
return {
...listTemplatesResponse,
template: templates,
count: templates.length

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wont this break paging? the pager reads this count as the total, so with 25 templates it shows only the first 10 and no page 2

}
},
fetchAllTemplates (params) {
const promises = []
const templates = {}
Expand All @@ -3008,7 +3023,7 @@ export default {
this.options.templates = templates
return Promise.all(promises).then((response) => {
response.forEach((resItem, idx) => {
templates[templateFilters[idx]] = _.isEmpty(resItem.listtemplatesresponse) ? { count: 0, template: [] } : resItem.listtemplatesresponse
templates[templateFilters[idx]] = this.filterDeployableTemplates(resItem.listtemplatesresponse)
this.options.templates = { ...templates }
})
this.updateSelectedTemplateHypervisor()
Expand Down