From 03e26b255f676c5a30c563c8cfdb6e6cb1a9c65f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= Date: Sat, 28 Dec 2019 17:29:43 +0100 Subject: [PATCH 1/2] Use fluid viewhelpers --- .../Resources/Private/Templates/Search/Searchbar.html | 9 ++++----- .../Resources/Private/Templates/Search/Searchbox.html | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Search/Searchbar.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Search/Searchbar.html index a58c2663..80fa60a8 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Search/Searchbar.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Search/Searchbar.html @@ -1,7 +1,6 @@ + xmlns:ep="http://typo3.org/ns/EP/EpTheme/ViewHelpers"> @@ -11,9 +10,9 @@ options-uri='' reset-uri='' argument-prefix='' - :initial-search-params='{searchParams}' - :initial-filter-options='{filterOptions}' - :date-presets='{settings.datePickerPresets -> v:format.json.encode()}' + :initial-search-params='{searchParams -> f:format.json() -> f:format.raw()}' + :initial-filter-options='{filterOptions -> f:format.json() -> f:format.raw()}' + :date-presets='{settings.datePickerPresets -> f:format.json() -> f:format.raw()}' inline-template>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Search/Searchbox.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Search/Searchbox.html index fdae422f..c953da19 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Search/Searchbox.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Search/Searchbox.html @@ -1,7 +1,6 @@ + xmlns:ep="http://typo3.org/ns/EP/EpTheme/ViewHelpers"> @@ -11,9 +10,9 @@ options-uri='' reset-uri='' argument-prefix='' - :initial-search-params='{searchParams}' - :initial-filter-options='{filterOptions}' - :date-presets='{settings.datePickerPresets -> v:format.json.encode()}' + :initial-search-params='{searchParams -> f:format.json() -> f:format.raw()}' + :initial-filter-options='{filterOptions -> f:format.json() -> f:format.raw()}' + :date-presets='{settings.datePickerPresets -> f:format.json() -> f:format.raw()}' inline-template>
Date: Sat, 28 Dec 2019 17:30:03 +0100 Subject: [PATCH 2/2] Avoid selection of invalid dates --- .../Private/Assets/js/components/DaterangeSelect.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/DaterangeSelect.vue b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/DaterangeSelect.vue index cb78309e..9e7270aa 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/DaterangeSelect.vue +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/DaterangeSelect.vue @@ -107,6 +107,10 @@ if (this.from && this.to) { this.picker.setDate([ new Date(this.from), new Date(this.to) ]); } + if (this.minDate && this.maxDate) { + this.picker.set('minDate', new Date(this.minDate)); + this.picker.set('maxDate', new Date(this.maxDate)); + } }); EventBus.$on('filterSettingsReset', () => { this.reset();