ami/tl-vikunja
1
0
Fork 0
Code Activity

fix(repeat): prevent disappearing repeat mode settings when modes other than default repeat mode were selected

Browse Source 
Resolves https://kolaente.dev/vikunja/frontend/issues/3585
This commit is contained in:
kolaente
2023-06-11 09:48:44 +02:00
parent 77bedbd1cf
commit bd7d09c17c
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/components/tasks/partials/repeatAfter.vue
View File

@ -70,6 +70,7 @@ import {error} from '@/message'
import {TASK_REPEAT_MODES} from '@/types/IRepeatMode'
import type {IRepeatAfter} from '@/types/IRepeatAfter'
import type {ITask} from '@/modelTypes/ITask'
import TaskModel from '@/models/task'
const props = defineProps({
modelValue: {
@ -87,7 +88,7 @@ const {t} = useI18n({useScope: 'global'})
const emit = defineEmits(['update:modelValue'])
const task = ref<ITask>()
const task = ref<ITask>(new TaskModel())
const repeatAfter = reactive({
amount: 0,
type: '',
@ -95,7 +96,7 @@ const repeatAfter = reactive({
watch(
() => props.modelValue,
(value) => {
(value: ITask) => {
task.value = value
if (typeof value.repeatAfter !== 'undefined') {
Object.assign(repeatAfter, value.repeatAfter)
@ -105,11 +106,14 @@ watch(
)
function updateData() {
if (!task.value || task.value.repeatMode !== TASK_REPEAT_MODES.REPEAT_MODE_DEFAULT && repeatAfter.amount === 0) {
if (!task.value ||
(task.value.repeatMode === TASK_REPEAT_MODES.REPEAT_MODE_DEFAULT && repeatAfter.amount === 0) ||
(task.value.repeatMode === TASK_REPEAT_MODES.REPEAT_MODE_FROM_CURRENT_DATE && repeatAfter.amount === 0)
) {
return
}
if (repeatAfter.amount < 0) {
if (task.value.repeatMode === TASK_REPEAT_MODES.REPEAT_MODE_DEFAULT && repeatAfter.amount < 0) {
error({message: t('task.repeat.invalidAmount')})
return
}