Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit dec0d4e1 authored by Christoph Wurst's avatar Christoph Wurst Committed by GitHub
Browse files

Merge pull request #3784 from nextcloud/fix/appointments-conflict-calendar-and-target-calendar 

Don't allow a calendar for appointment conflicts if it's the target
parents 5a1f2965 da8e7a7a

src/components/AppointmentConfigModal.vue

+7 −2
Original line number Diff line number Diff line
@@ -73,10 +73,10 @@ 


						<div

							class="appointment-config-modal__form__row appointment-config-modal__form__row--local">

							<label>Calendars to check for conflicts</label>

							<label>{{ t('calendar', 'Additional calendars to check for conflicts') }}</label>

							<CalendarPicker

								:value="conflictCalendars"

								:calendars="ownSortedCalendars"

								:calendars="selectableConflictCalendars"

								:multiple="true"

								:show-calendar-on-select="false"

								@select-calendar="addConflictCalender"
@@ -218,6 +218,10 @@ export default { 
			const uri = this.editing.targetCalendarUri

			return this.ownSortedCalendars.find(cal => this.calendarUrlToUri(cal.url) === uri)

		},

		selectableConflictCalendars() {

			// The target calendar is always a conflict calendar, remove it from additional conflict calendars

			return this.ownSortedCalendars.filter(calendar => calendar.url !== this.calendar.url)

		},

		conflictCalendars() {

			const freebusyUris = this.editing.calendarFreeBusyUris ?? []

			return freebusyUris.map(uri => {
@@ -256,6 +260,7 @@ export default { 
		},

		changeCalendar(calendar) {

			this.editing.targetCalendarUri = this.calendarUrlToUri(calendar.url)

			this.editing.calendarFreeBusyUris = this.editing.calendarFreeBusyUris.filter(uri => uri !== this.calendarUrlToUri(calendar.url))

		},

		addConflictCalender(calendar) {

			this.editing.calendarFreeBusyUris.push(this.calendarUrlToUri(calendar.url))