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

Unverified Commit b2bae054 authored by Richard Steinmetz's avatar Richard Steinmetz Committed by GitHub
Browse files

Merge pull request #3929 from nextcloud/backport/3922/stable3.0 

[stable3.0] Fix trashbin being inacessible when the calendar of a deleted object's unavailable
parents 10ab4420 7148ebd3

src/components/AppNavigation/CalendarList/Trashbin.vue

+3 −3
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ export default { 
				} catch (e) {

					// ignore

				}

				let subline = vobject.calendar.displayName

				let subline = vobject.calendar?.displayName || t('calendar', 'Unknown calendar')

				if (vobject.isEvent) {

					const event = vobject?.calendarComponent.getFirstComponent('VEVENT')

					if (event?.startDate.jsDate && event?.isAllDay()) {
@@ -181,8 +181,8 @@ export default { 
					}

				}

				const color = vobject.calendarComponent.getComponentIterator().next().value?.color

						?? vobject.calendar.color

						?? uidToHexColor(vobject.calendar.displayName)

						?? vobject.calendar?.color

						?? uidToHexColor(subline)

				return {

					vobject,

					type: 'object',