Skip to content

Honour listall param for list templates api #9300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sureshanaparti merged 2 commits into from
Jun 26, 2024
Merged

Honour listall param for list templates api #9300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
423362d
Honour listall param for list templates api
vishesh92 Jun 25, 2024
b9a6ec7
Don't show templates from another project inside a project view
vishesh92 Jun 25, 2024
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
2 changes: 1 addition & 1 deletion server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4337,7 +4337,7 @@ private Pair<List<TemplateJoinVO>, Integer> searchForTemplatesInternal(ListTempl
Account caller = CallContext.current().getCallingAccount();
Long parentTemplateId = cmd.getParentTemplateId();

boolean listAll = false;
boolean listAll = cmd.listAll();
Comment thread
sureshanaparti marked this conversation as resolved.
if (templateFilter != null && templateFilter == TemplateFilter.all) {
if (caller.getType() == Account.Type.NORMAL) {
throw new InvalidParameterValueException("Filter " + TemplateFilter.all + " can be specified by admin only");
Expand Down
14 changes: 12 additions & 2 deletions ui/src/views/compute/DeployVM.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2276,11 +2276,16 @@ export default {
}
args.zoneid = _.get(this.zone, 'id')
args.templatefilter = templateFilter
args.projectid = -1
if (this.$store.getters.project?.id) {
args.projectid = this.$store.getters.project.id
} else {
args.projectid = -1
}
args.details = 'all'
args.showicon = 'true'
args.id = this.templateId
args.isvnf = false
args.listall = true

return new Promise((resolve, reject) => {
api('listTemplates', args).then((response) => {
Expand All @@ -2299,10 +2304,15 @@ export default {
}
args.zoneid = _.get(this.zone, 'id')
args.isoFilter = isoFilter
args.projectid = -1
if (this.$store.getters.project?.id) {
args.projectid = this.$store.getters.project.id
} else {
args.projectid = -1
}
args.bootable = true
args.showicon = 'true'
args.id = this.isoId
args.listall = true

return new Promise((resolve, reject) => {
api('listIsos', args).then((response) => {
Expand Down
3 changes: 3 additions & 0 deletions ui/src/views/compute/wizard/TemplateIsoRadioGroup.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@
:os-name="item.osName" />
&nbsp;
{{ item.displaytext }}
<span v-if="item?.projectid">
| <project-outlined /> {{ item.project }}
</span>
</a-radio>
</a-radio-group>
</a-list-item>
Expand Down