mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
ui: fix initial pagination for images in deploy forms (#11349)
Regression from #10773 Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
This commit is contained in:
parent
44f80648a9
commit
b2ce1fb9c3
@ -2981,10 +2981,10 @@ export default {
|
||||
if (this.isModernImageSelection && this.form.guestoscategoryid && !['-1', '0'].includes(this.form.guestoscategoryid)) {
|
||||
args.oscategoryid = this.form.guestoscategoryid
|
||||
}
|
||||
if (args.keyword || (args.category && args.category !== templateFilter)) {
|
||||
if (!args.page || args.keyword || (args.category && args.category !== templateFilter)) {
|
||||
args.page = 1
|
||||
args.pageSize = args.pageSize || 10
|
||||
}
|
||||
args.pageSize = args.pageSize || 10
|
||||
args.zoneid = _.get(this.zone, 'id')
|
||||
if (this.isZoneSelectedMultiArch) {
|
||||
args.arch = this.selectedArchitecture
|
||||
|
||||
@ -2759,10 +2759,10 @@ export default {
|
||||
if (this.isModernImageSelection && this.form.guestoscategoryid && !['-1', '0'].includes(this.form.guestoscategoryid)) {
|
||||
args.oscategoryid = this.form.guestoscategoryid
|
||||
}
|
||||
if (args.keyword || (args.category && args.category !== templateFilter)) {
|
||||
if (!args.page || args.keyword || (args.category && args.category !== templateFilter)) {
|
||||
args.page = 1
|
||||
args.pageSize = args.pageSize || 10
|
||||
}
|
||||
args.pageSize = args.pageSize || 10
|
||||
args.zoneid = _.get(this.zone, 'id')
|
||||
if (this.isZoneSelectedMultiArch) {
|
||||
args.arch = this.selectedArchitecture
|
||||
@ -2798,10 +2798,10 @@ export default {
|
||||
if (this.isModernImageSelection && this.form.guestoscategoryid) {
|
||||
args.oscategoryid = this.form.guestoscategoryid
|
||||
}
|
||||
if (args.keyword || args.category !== isoFilter) {
|
||||
if (!args.page || args.keyword || (args.category && args.category !== isoFilter)) {
|
||||
args.page = 1
|
||||
args.pageSize = args.pageSize || 10
|
||||
}
|
||||
args.pageSize = args.pageSize || 10
|
||||
args.zoneid = _.get(this.zone, 'id')
|
||||
if (this.isZoneSelectedMultiArch) {
|
||||
args.arch = this.selectedArchitecture
|
||||
|
||||
@ -2546,10 +2546,10 @@ export default {
|
||||
if (this.isModernImageSelection && this.form.guestoscategoryid && !['-1', '0'].includes(this.form.guestoscategoryid)) {
|
||||
args.oscategoryid = this.form.guestoscategoryid
|
||||
}
|
||||
if (args.keyword || (args.category && args.category !== templateFilter)) {
|
||||
if (!args.page || args.keyword || (args.category && args.category !== templateFilter)) {
|
||||
args.page = 1
|
||||
args.pageSize = args.pageSize || 10
|
||||
}
|
||||
args.pageSize = args.pageSize || 10
|
||||
args.zoneid = _.get(this.zone, 'id')
|
||||
if (this.isZoneSelectedMultiArch) {
|
||||
args.arch = this.selectedArchitecture
|
||||
|
||||
@ -361,10 +361,10 @@ export default {
|
||||
if (this.isModernImageSelection && this.selectedGuestOsCategoryId && !['-1', '0'].includes(this.selectedGuestOsCategoryId)) {
|
||||
args.oscategoryid = this.selectedGuestOsCategoryId
|
||||
}
|
||||
if (args.keyword || (args.category && args.category !== templateFilter)) {
|
||||
if (!args.page || args.keyword || (args.category && args.category !== templateFilter)) {
|
||||
args.page = 1
|
||||
args.pageSize = args.pageSize || 10
|
||||
}
|
||||
args.pageSize = args.pageSize || 10
|
||||
args.zoneid = this.resource.zoneid
|
||||
args.templatefilter = templateFilter
|
||||
args.isready = true
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user