address some issues with recurrent events, fix #247

This commit is contained in:
lesion 2023-03-14 16:42:24 +01:00
parent f7357666ca
commit fc8a9f4506
No known key found for this signature in database
GPG key ID: 352918250B012177
3 changed files with 4 additions and 4 deletions

View file

@ -1,7 +1,7 @@
<template lang="pug"> <template lang="pug">
v-col(cols=12) v-col(cols=12)
.text-center .text-center
v-btn-toggle.v-col-6.flex-column.flex-sm-row(v-model='type' color='primary' @change='type => change("type", type)') v-btn-toggle.v-col-6.flex-column.flex-sm-row(v-if='!event.parentId' v-model='type' color='primary' @change='type => change("type", type)')
v-btn(value='normal' label="normal") {{ $t('event.normal') }} v-btn(value='normal' label="normal") {{ $t('event.normal') }}
v-btn(v-if='settings.allow_multidate_event' value='multidate' label='multidate') {{ $t('event.multidate') }} v-btn(v-if='settings.allow_multidate_event' value='multidate' label='multidate') {{ $t('event.multidate') }}
v-btn(v-if='settings.allow_recurrent_event' value='recurrent' label="recurrent") {{ $t('event.recurrent') }} v-btn(v-if='settings.allow_recurrent_event' value='recurrent' label="recurrent") {{ $t('event.recurrent') }}

View file

@ -11,7 +11,7 @@ span
v-icon(v-if='event.is_visible' v-text='mdiEyeOff') v-icon(v-if='event.is_visible' v-text='mdiEyeOff')
v-icon(v-else='event.is_visible' v-text='mdiEye') v-icon(v-else='event.is_visible' v-text='mdiEye')
v-list-item-content v-list-item-content
v-list-item-title(v-text="$t(`common.${event.is_visible?'hide':'confirm'}`)") v-list-item-title(v-text="$t(`common.${event.is_visible?(event.parentId?'skip':'hide'):'confirm'}`)")
//- Edit event //- Edit event
v-list-item(:to='`/add/${event.id}`') v-list-item(:to='`/add/${event.id}`')
@ -21,7 +21,7 @@ span
v-list-item-title(v-text="$t('common.edit')") v-list-item-title(v-text="$t('common.edit')")
//- Remove //- Remove
v-list-item(@click='remove(false)') v-list-item(v-if='!event.parentId' @click='remove(false)')
v-list-item-icon v-list-item-icon
v-icon(v-text='mdiDelete') v-icon(v-text='mdiDelete')
v-list-item-content v-list-item-content

View file

@ -1,7 +1,7 @@
<template lang="pug"> <template lang="pug">
v-container.container.pa-0.pa-md-3 v-container.container.pa-0.pa-md-3
v-card v-card
v-alert(v-if='url!==settings.baseurl' outlined type='warning' color='red' show-icon :icon='mdiAlert') v-alert(v-if='url!==settings.baseurl' outlined type='warning' show-icon :icon='mdiAlert')
span(v-html="$t('admin.wrong_domain_warning', { url, baseurl: settings.baseurl })") span(v-html="$t('admin.wrong_domain_warning', { url, baseurl: settings.baseurl })")
v-tabs(v-model='selectedTab' show-arrows :next-icon='mdiChevronRight' :prev-icon='mdiChevronLeft') v-tabs(v-model='selectedTab' show-arrows :next-icon='mdiChevronRight' :prev-icon='mdiChevronLeft')