diff --git a/resources/js/common/PMColumnFilterPopoverCommonMixin.js b/resources/js/common/PMColumnFilterPopoverCommonMixin.js index 52290a0cdc..a418b748bc 100644 --- a/resources/js/common/PMColumnFilterPopoverCommonMixin.js +++ b/resources/js/common/PMColumnFilterPopoverCommonMixin.js @@ -114,19 +114,19 @@ const PMColumnFilterCommonMixin = { this.advancedFilter[index] = json; this.markStyleWhenColumnSetAFilter(); this.storeFilterConfiguration(); - this.fetch(); + this.fetch(true); }, onClear(index) { this.advancedFilter[index] = []; this.markStyleWhenColumnSetAFilter(); this.storeFilterConfiguration(); - this.fetch(); + this.fetch(true); }, onChangeSort(value, field) { this.setOrderByProps(field, value); this.markStyleWhenColumnSetAFilter(); this.storeFilterConfiguration(); - this.fetch(); + this.fetch(true); }, onUpdate(object, index) { if (object.$refs.pmColumnFilterForm && diff --git a/resources/js/requests/components/RequestsListing.vue b/resources/js/requests/components/RequestsListing.vue index fbe20f383d..616912c5fc 100644 --- a/resources/js/requests/components/RequestsListing.vue +++ b/resources/js/requests/components/RequestsListing.vue @@ -391,7 +391,7 @@ export default { } return data; }, - fetch() { + fetch(navigateToFirstPage = false) { Vue.nextTick(() => { if (this.cancelToken) { this.cancelToken(); @@ -400,7 +400,7 @@ export default { const CancelToken = ProcessMaker.apiClient.CancelToken; - const { pmql, filter, advancedFilter } = this.buildPmqlAndFilter(); + const { pmql, filter, advancedFilter } = this.buildPmqlAndFilter(navigateToFirstPage); // Load from our api client ProcessMaker.apiClient @@ -443,7 +443,7 @@ export default { }); }); }, - buildPmqlAndFilter() { + buildPmqlAndFilter(navigateToFirstPage) { let pmql = ''; if (this.pmql !== undefined) { @@ -472,7 +472,8 @@ export default { this.previousPmql = pmql; const advancedFilter = this.getAdvancedFilter(); - if (this.previousAdvancedFilter !== advancedFilter) { + + if (this.previousAdvancedFilter !== advancedFilter && navigateToFirstPage) { this.page = 1; }