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

Unverified Commit da8e7a7a authored by Christoph Wurst's avatar Christoph Wurst
Browse files

Don't allow a calendar for appointment conflicts if it's the target 



The target is always a conflict calendar. It's confusing if it can be
selected twice as the second selection has no effect.

This also drop the new targe calendar from the conflict list if it was
on there.

Signed-off-by: default avatarChristoph Wurst <christoph@winzerhof-wurst.at>
parent 5a1f2965

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))