From 1622410d742348717d7bab5f53d138c49e5b3a4d Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Wed, 28 Feb 2024 13:44:34 +0530 Subject: [PATCH] fix: load more not working when between filter is applied --- frontend/src/components/Controls/DateRangePicker.vue | 4 ++-- frontend/src/components/Filter.vue | 7 ------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/frontend/src/components/Controls/DateRangePicker.vue b/frontend/src/components/Controls/DateRangePicker.vue index 3f147c51..e78e0667 100644 --- a/frontend/src/components/Controls/DateRangePicker.vue +++ b/frontend/src/components/Controls/DateRangePicker.vue @@ -105,8 +105,8 @@ export default { Popover, }, data() { - const fromDate = this.value ? this.value.split(',')[0] : '' - const toDate = this.value ? this.value.split(',')[1] : '' + const fromDate = this.value ? this.value[0] : '' + const toDate = this.value ? this.value[1] : '' return { currentYear: null, currentMonth: null, diff --git a/frontend/src/components/Filter.vue b/frontend/src/components/Filter.vue index c223329b..6be6ec46 100644 --- a/frontend/src/components/Filter.vue +++ b/frontend/src/components/Filter.vue @@ -182,13 +182,6 @@ function convertFilters(data, allFilters) { value = ['equals', value[1] ? 'Yes' : 'No'] } } - // if (value[0] === 'LIKE' || value[0] === 'NOT LIKE') { - // value[1] = value[1].replace(/%/g, '') - // } - - if (value[0] === 'between' && Array.isArray(value[1])) { - value[1] = value[1].join(',') - } if (field) { f.push({