github/directus
1
0
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-01-30 15:58:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update calendar fix with _between (#8843)

Browse Source 
* fix 8824

* changed calendarFilter type

Co-authored-by: Rijk van Zanten <rijkvanzanten@me.com>
This commit is contained in:
Alexander
2021-10-16 01:26:13 +03:00
committed by GitHub
parent 2baec5efcf
commit c69d6e8a54
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/layouts/calendar/index.ts
View File

@@ -62,20 +62,13 @@ export default defineLayout<LayoutOptions>({
_and: [
{
[startDateField.value]: {
_gte: formatISO(calendar.value.view.currentStart),
},
},
{
[startDateField.value]: {
_lte: formatISO(calendar.value.view.currentEnd),
_between: [formatISO(calendar.value.view.currentStart), formatISO(calendar.value.view.currentEnd)],
},
},
],
};
if (filter.value) {
calendarFilter._and.push(filter.value);
}
if (filter.value) calendarFilter._and.push(filter.value);
return calendarFilter;
});