From 683a0a794097ba83619595191b9f8fdab15da153 Mon Sep 17 00:00:00 2001 From: byquanton <32410361+byquanton@users.noreply.github.com> Date: Wed, 14 Oct 2026 13:42:45 +0200 Subject: [PATCH 1/3] fix: apply the selected recurrence end date RepeatEndRepeat used the old bindings (:value/@input) Signed-off-by: byquanton <32410361+byquanton@users.noreply.github.com> --- src/components/Repeat/RepeatEndRepeat.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/Repeat/RepeatEndRepeat.vue b/src/components/Repeat/RepeatEndRepeat.vue index eb8f4c67f..2f5af1094 100644 --- a/src/components/Repeat/RepeatEndRepeat.vue +++ b/src/components/Repeat/RepeatEndRepeat.vue @@ -17,10 +17,11 @@ @update:model-value="changeEndType" /> + @update:model-value="changeUntil" />
Date: Wed, 14 Oct 2026 14:49:20 +0200 Subject: [PATCH 2/3] fix: completing recurring tasks with an end date Mark the calendar-js recurrence value raw, see nextcloud/calendar#8365. Signed-off-by: byquanton <32410361+byquanton@users.noreply.github.com> --- src/models/task.js | 3 ++- src/store/tasks.js | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/models/task.js b/src/models/task.js index 0c3313bcf..bf0ecef17 100644 --- a/src/models/task.js +++ b/src/models/task.js @@ -33,6 +33,7 @@ import { getDefaultRecurrenceRuleObject, mapRecurrenceRuleValueToRecurrenceRuleObject, } from './recurrenceRule.js' +import {markRaw} from "vue"; export default class Task { @@ -138,7 +139,7 @@ export default class Task { try { // Get the ICAL.Recur value and convert directly to RecurValue const icalRecur = firstRecurrenceRule.getFirstValue() - const recurValue = RecurValue.fromICALJs(icalRecur) + const recurValue = markRaw(RecurValue.fromICALJs(icalRecur)) // Get reference date for the mapping function const referenceDate = this._due || this._start diff --git a/src/store/tasks.js b/src/store/tasks.js index 56d68e398..3f74b6120 100644 --- a/src/store/tasks.js +++ b/src/store/tasks.js @@ -36,6 +36,7 @@ import moment from '@nextcloud/moment' import ICAL from 'ical.js' import { randomUUID } from '../utils/crypto.js' +import {markRaw} from "vue"; /** * Clone an ICAL.Time without triggering timezone lookups. @@ -1716,7 +1717,7 @@ const actions = { // Update the task model task._recurrenceRule = { - recurrenceRuleValue: recurrenceValue, + recurrenceRuleValue: markRaw(recurrenceValue), frequency: recurrenceRule.frequency, interval: recurrenceRule.interval || 1, count: recurrenceRule.count || null, From 8ebdf0e8abd05958aaaf2c16cf94082bf3e67fbb Mon Sep 17 00:00:00 2001 From: byquanton <32410361+byquanton@users.noreply.github.com> Date: Wed, 14 Oct 2026 12:54:57 +0000 Subject: [PATCH 3/3] fix: complete recurring tasks after their last occurrence Signed-off-by: byquanton <32410361+byquanton@users.noreply.github.com> --- src/store/tasks.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/store/tasks.js b/src/store/tasks.js index 3f74b6120..76d60ea3e 100644 --- a/src/store/tasks.js +++ b/src/store/tasks.js @@ -1966,8 +1966,11 @@ const actions = { // Save the updated master task await context.dispatch('updateTask', freshTask) } else { - // No more occurrences - keep task completed - // The exception will show as completed, master can be left as-is + // No more occurrences - complete the master task + freshTask.setComplete(100) + freshTask.setCompleted(true) + freshTask.setStatus('COMPLETED') + await context.dispatch('updateTask', freshTask) } } catch (error) { console.error('Error handling recurring task completion:', error)