Merge pull request #1873 from nextcloud/fix/1803/trashbin

Don't break trashbin if calendar is undefined
nextcloud · Dec 5, 2021 · 7c89de7 · 7c89de7
2 parents 861144e + de65039
commit 7c89de7
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/components/AppNavigation/Trashbin.vue b/src/components/AppNavigation/Trashbin.vue
@@ -158,7 +158,7 @@ export default {
 				} catch (e) {
 					// ignore
 				}
-				let subline = vobject.calendar.displayName
+				let subline = vobject.calendar?.displayName || t('tasks', 'Unknown calendar')
 				if (vobject.isEvent) {
 					const event = vobject?.calendarComponent.getFirstComponent('VEVENT')
 					if (event?.startDate.jsDate && event?.isAllDay()) {
@@ -168,8 +168,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',