You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ro...@apache.org on 2020/09/15 07:01:34 UTC
[cloudstack-primate] branch master updated: FIX - Reduce max
pagination from 500/page to 200/page (#711)
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack-primate.git
The following commit(s) were added to refs/heads/master by this push:
new 164d25f FIX - Reduce max pagination from 500/page to 200/page (#711)
164d25f is described below
commit 164d25f9a102edd188b105086d7417bbb39e9a8f
Author: Hoang Nguyen <ho...@unitech.vn>
AuthorDate: Tue Sep 15 14:01:27 2020 +0700
FIX - Reduce max pagination from 500/page to 200/page (#711)
* Reduce max pagination from 500/page to 200/page
* fix extra braces
---
src/components/view/ListResourceTable.vue | 4 ++--
src/views/AutogenView.vue | 2 +-
src/views/compute/wizard/AffinityGroupSelection.vue | 2 +-
src/views/compute/wizard/ComputeOfferingSelection.vue | 2 +-
src/views/compute/wizard/DiskOfferingSelection.vue | 2 +-
src/views/compute/wizard/NetworkSelection.vue | 2 +-
src/views/compute/wizard/SecurityGroupSelection.vue | 2 +-
src/views/compute/wizard/SshKeyPairSelection.vue | 2 +-
src/views/compute/wizard/TemplateIsoRadioGroup.vue | 2 +-
src/views/network/IngressEgressRuleConfigure.vue | 2 +-
10 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/components/view/ListResourceTable.vue b/src/components/view/ListResourceTable.vue
index 500a374..c498d16 100644
--- a/src/components/view/ListResourceTable.vue
+++ b/src/components/view/ListResourceTable.vue
@@ -57,7 +57,7 @@
:pageSize="options.pageSize"
:total="total"
:showTotal="total => `${$t('label.total')} ${total} ${$t('label.items')}`"
- :pageSizeOptions="device === 'desktop' ? ['20', '50', '100', '500'] : ['10', '20', '50', '100', '500']"
+ :pageSizeOptions="device === 'desktop' ? ['20', '50', '100', '200'] : ['10', '20', '50', '100', '200']"
@change="handleTableChange"
@showSizeChange="handlePageSizeChange"
showSizeChanger>
@@ -151,7 +151,7 @@ export default {
this.dataSource = this.items
this.defaultPagination = {
showSizeChanger: true,
- pageSizeOptions: this.mixinDevice === 'desktop' ? ['20', '50', '100', '500'] : ['10', '20', '50', '100', '500']
+ pageSizeOptions: this.mixinDevice === 'desktop' ? ['20', '50', '100', '200'] : ['10', '20', '50', '100', '200']
}
return
}
diff --git a/src/views/AutogenView.vue b/src/views/AutogenView.vue
index 75a23d2..d96833a 100644
--- a/src/views/AutogenView.vue
+++ b/src/views/AutogenView.vue
@@ -313,7 +313,7 @@
:pageSize="pageSize"
:total="itemCount"
:showTotal="total => `${$t('label.showing')} ${Math.min(total, 1+((page-1)*pageSize))}-${Math.min(page*pageSize, total)} ${$t('label.of')} ${total} ${$t('label.items')}`"
- :pageSizeOptions="device === 'desktop' ? ['20', '50', '100', '500'] : ['10', '20', '50', '100', '500']"
+ :pageSizeOptions="device === 'desktop' ? ['20', '50', '100', '200'] : ['10', '20', '50', '100', '200']"
@change="changePage"
@showSizeChange="changePageSize"
showSizeChanger
diff --git a/src/views/compute/wizard/AffinityGroupSelection.vue b/src/views/compute/wizard/AffinityGroupSelection.vue
index 08567f8..e3ce1c7 100644
--- a/src/views/compute/wizard/AffinityGroupSelection.vue
+++ b/src/views/compute/wizard/AffinityGroupSelection.vue
@@ -42,7 +42,7 @@
:pageSize="options.pageSize"
:total="rowCount"
:showTotal="total => `${$t('label.total')} ${total} ${$t('label.items')}`"
- :pageSizeOptions="['10', '20', '40', '80', '100', '500']"
+ :pageSizeOptions="['10', '20', '40', '80', '100', '200']"
@change="onChangePage"
@showSizeChange="onChangePageSize"
showSizeChanger>
diff --git a/src/views/compute/wizard/ComputeOfferingSelection.vue b/src/views/compute/wizard/ComputeOfferingSelection.vue
index 7e0015b..ce27c3d 100644
--- a/src/views/compute/wizard/ComputeOfferingSelection.vue
+++ b/src/views/compute/wizard/ComputeOfferingSelection.vue
@@ -42,7 +42,7 @@
:pageSize="options.pageSize"
:total="rowCount"
:showTotal="total => `${$t('label.total')} ${total} ${$t('label.items')}`"
- :pageSizeOptions="['10', '20', '40', '80', '100', '500']"
+ :pageSizeOptions="['10', '20', '40', '80', '100', '200']"
@change="onChangePage"
@showSizeChange="onChangePageSize"
showSizeChanger>
diff --git a/src/views/compute/wizard/DiskOfferingSelection.vue b/src/views/compute/wizard/DiskOfferingSelection.vue
index 5a3023b..8e83cc8 100644
--- a/src/views/compute/wizard/DiskOfferingSelection.vue
+++ b/src/views/compute/wizard/DiskOfferingSelection.vue
@@ -53,7 +53,7 @@
:pageSize="options.pageSize"
:total="rowCount"
:showTotal="total => `${$t('label.total')} ${total} ${$t('label.items')}`"
- :pageSizeOptions="['10', '20', '40', '80', '100', '500']"
+ :pageSizeOptions="['10', '20', '40', '80', '100', '200']"
@change="onChangePage"
@showSizeChange="onChangePageSize"
showSizeChanger>
diff --git a/src/views/compute/wizard/NetworkSelection.vue b/src/views/compute/wizard/NetworkSelection.vue
index cf8df5a..e3ea0be 100644
--- a/src/views/compute/wizard/NetworkSelection.vue
+++ b/src/views/compute/wizard/NetworkSelection.vue
@@ -58,7 +58,7 @@
:pageSize="options.pageSize"
:total="rowCount"
:showTotal="total => `${$t('label.total')} ${total} ${$t('label.items')}`"
- :pageSizeOptions="['10', '20', '40', '80', '100', '500']"
+ :pageSizeOptions="['10', '20', '40', '80', '100', '200']"
@change="onChangePage"
@showSizeChange="onChangePageSize"
showSizeChanger>
diff --git a/src/views/compute/wizard/SecurityGroupSelection.vue b/src/views/compute/wizard/SecurityGroupSelection.vue
index 0de7738..07aabd2 100644
--- a/src/views/compute/wizard/SecurityGroupSelection.vue
+++ b/src/views/compute/wizard/SecurityGroupSelection.vue
@@ -41,7 +41,7 @@
:pageSize="pageSize"
:total="rowCount"
:showTotal="total => `${$t('label.total')} ${total} ${$t('label.items')}`"
- :pageSizeOptions="['10', '20', '40', '80', '100', '500']"
+ :pageSizeOptions="['10', '20', '40', '80', '100', '200']"
@change="onChangePage"
@showSizeChange="onChangePageSize"
showSizeChanger>
diff --git a/src/views/compute/wizard/SshKeyPairSelection.vue b/src/views/compute/wizard/SshKeyPairSelection.vue
index 8f27a52..c1db773 100644
--- a/src/views/compute/wizard/SshKeyPairSelection.vue
+++ b/src/views/compute/wizard/SshKeyPairSelection.vue
@@ -41,7 +41,7 @@
:pageSize="options.pageSize"
:total="rowCount"
:showTotal="total => `${$t('label.total')} ${total} ${$t('label.items')}`"
- :pageSizeOptions="['10', '20', '40', '80', '100', '500']"
+ :pageSizeOptions="['10', '20', '40', '80', '100', '200']"
@change="onChangePage"
@showSizeChange="onChangePageSize"
showSizeChanger>
diff --git a/src/views/compute/wizard/TemplateIsoRadioGroup.vue b/src/views/compute/wizard/TemplateIsoRadioGroup.vue
index 5b5b691..f7e1860 100644
--- a/src/views/compute/wizard/TemplateIsoRadioGroup.vue
+++ b/src/views/compute/wizard/TemplateIsoRadioGroup.vue
@@ -49,7 +49,7 @@
:pageSize="options.pageSize"
:total="itemCount"
:showTotal="total => `${$t('label.total')} ${total} ${$t('label.items')}`"
- :pageSizeOptions="['10', '20', '40', '80', '100', '500']"
+ :pageSizeOptions="['10', '20', '40', '80', '100', '200']"
@change="onChangePage"
@showSizeChange="onChangePageSize"
showSizeChanger>
diff --git a/src/views/network/IngressEgressRuleConfigure.vue b/src/views/network/IngressEgressRuleConfigure.vue
index 96b6d9d..7b9965a 100644
--- a/src/views/network/IngressEgressRuleConfigure.vue
+++ b/src/views/network/IngressEgressRuleConfigure.vue
@@ -83,7 +83,7 @@
style="overflow-y: auto"
:columns="columns"
:dataSource="rules"
- :pagination="{ pageSizeOptions: ['10', '20', '40', '80', '100', '500'], showSizeChanger: true}"
+ :pagination="{ pageSizeOptions: ['10', '20', '40', '80', '100', '200'], showSizeChanger: true}"
:rowKey="record => record.ruleid">
<template slot="protocol" slot-scope="record">
{{ record.protocol | capitalise }}