Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/store/calendarObjectInstance.js
Original file line number Diff line number Diff line change
Expand Up @@ -1517,6 +1517,7 @@ export default defineStore('calendarObjectInstance', {
end: endDate.unixTime,
timezoneId: oldEventComponent.startDate.timezoneId,
isAllDay: oldEventComponent.isAllDay(),
calendarId: this.calendarObject?.calendarId ?? null,
})
const eventComponent = getObjectAtRecurrenceId(calendarObject, startDate.jsDate)
copyCalendarObjectInstanceIntoEventComponent(oldCalendarObjectInstance, eventComponent, true)
Expand Down
7 changes: 4 additions & 3 deletions src/store/calendarObjects.js
Original file line number Diff line number Diff line change
Expand Up @@ -211,9 +211,10 @@ export default defineStore('calendarObjects', {
* @param {number} data.end Timestamp for end of new event
* @param {string} data.timezoneId asd
* @param {boolean} data.isAllDay foo
* @param {string} [data.calendarId] Optional calendar id to create the event in
* @return {Promise<CalendarObject>}
*/
createNewEvent({ start, end, timezoneId, isAllDay }) {
createNewEvent({ start, end, timezoneId, isAllDay, calendarId = null }) {
const calendarsStore = useCalendarsStore()
const timezoneManager = getTimezoneManager()
const timezone = timezoneManager.getTimezoneForId(timezoneId)
Expand All @@ -238,8 +239,8 @@ export default defineStore('calendarObjects', {
vObject.undirtify()
}

const firstCalendar = calendarsStore.sortedCalendars[0].id
return Promise.resolve(mapCalendarJsToCalendarObject(calendar, firstCalendar))
const targetCalendar = calendarId || calendarsStore.sortedCalendars[0].id
return Promise.resolve(mapCalendarJsToCalendarObject(calendar, targetCalendar))
},

/**
Expand Down
Loading