From f4a0ef5d3592026c7a7c479bdfa68b83dd4ad63d Mon Sep 17 00:00:00 2001 From: lesion Date: Tue, 1 Feb 2022 12:45:19 +0100 Subject: [PATCH] fix show_recurrent filter in widget --- pages/export.vue | 7 ++++--- server/api/controller/event.js | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pages/export.vue b/pages/export.vue index f05babc1..6e82aa91 100644 --- a/pages/export.vue +++ b/pages/export.vue @@ -49,7 +49,7 @@ p(v-html='$t(`export.list_description`)') v-row - v-col.mr-2(:span='11') + v-col.col-12.col-lg-4 v-text-field(v-model='list.title' :label='$t("common.title")') v-text-field(v-model='list.maxEvents' type='number' min='1' :label='$t("common.max_events")') v-switch(v-model='list.theme' inset true-value='dark' false-value='light' :label="$t('admin.is_dark')") @@ -59,7 +59,8 @@ :title='list.title' :theme='list.theme' :places='filters.places.join(",")' - :tags='filters.tags.join(",")') + :tags='filters.tags.join(",")' + :show_recurrent='filters.show_recurrent') v-alert.pa-5.my-4.blue-grey.darken-4.text-body-1.lime--text.text--lighten-3
{{code}}
v-btn.float-end(text color='primary' @click='clipboard(code)') {{$t("common.copy")}} v-icon.ml-1 mdi-content-copy @@ -128,7 +129,7 @@ export default { } if (this.filters.show_recurrent) { - params.push('show_recurrent') + params.push(`show_recurrent="${this.filters.show_recurrent}"`) } if (this.list.maxEvents) { diff --git a/server/api/controller/event.js b/server/api/controller/event.js index ffcdf636..856d3639 100644 --- a/server/api/controller/event.js +++ b/server/api/controller/event.js @@ -558,8 +558,9 @@ const eventController = { const tags = req.query.tags const places = req.query.places const max = req.query.max + const show_recurrent = settingsController.settings.allow_recurrent_event && - (typeof req.query.show_recurrent !== 'undefined' ? req.query.show_recurrent === 'true' : settingsController.settings.recurrent_event_visible) + typeof req.query.show_recurrent !== 'undefined' ? req.query.show_recurrent === 'true' : settingsController.settings.recurrent_event_visible res.json(await eventController._select({ start, end, places, tags, show_recurrent, max