From 0b6c63d77398167fe16bea2ab08069558b877a30 Mon Sep 17 00:00:00 2001 From: James Collins Date: Wed, 25 Jan 2023 17:56:20 +1000 Subject: [PATCH] only limit current when no filters --- resources/js/views/WorkshopList.vue | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/resources/js/views/WorkshopList.vue b/resources/js/views/WorkshopList.vue index 8ff0126..c5eebcb 100644 --- a/resources/js/views/WorkshopList.vue +++ b/resources/js/views/WorkshopList.vue @@ -82,6 +82,7 @@ const handleLoad = async () => { try { let query = {}; query["limit"] = 10; + if (filterKeywords.value && filterKeywords.value.length > 0) { query["q"] = filterKeywords.value; } @@ -93,11 +94,14 @@ const handleLoad = async () => { timestampLocalToUtc(filterDateRange.value[0]) + "<>" + timestampLocalToUtc(filterDateRange.value[1]); - } else { - query["end_at"] = ">" + timestampNowUtc(); } - console.log(new Date().toDateString()); + if ( + Object.keys(query).length == 1 && + Object.keys(query)[0] == "length" + ) { + query["end_at"] = ">" + timestampNowUtc(); + } const url = buildUrlQuery("events", query); let result = await axios.get(url);