Merge pull request #2767 from nextcloud/fix/2704/task-talk

fix: task create dialog in Talk
nextcloud · Jan 19, 2025 · 8eb71eb · 8eb71eb
2 parents 746e0fb + 7dbde83
commit 8eb71eb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/lib/Listeners/BeforeTemplateRenderedListener.php b/lib/Listeners/BeforeTemplateRenderedListener.php
@@ -52,6 +52,7 @@ public function handle(Event $event): void {
 		$pathInfo = $this->request->getPathInfo();
 		if (strpos($pathInfo, '/call/') === 0 || strpos($pathInfo, '/apps/spreed') === 0) {
 			Util::addScript('tasks', 'tasks-talk');
+			Util::addStyle('tasks', 'tasks-talk');
 			Util::addStyle('tasks', 'tasks-icon');
 		}
 	}

diff --git a/src/components/AppSidebar/CalendarPickerItem.vue b/src/components/AppSidebar/CalendarPickerItem.vue
@@ -89,13 +89,15 @@ export default {
 		t,
 
 		stubCalendar(calendar) {
-			return {
-				id: calendar.url,
-				displayName: calendar.displayName,
-				color: calendar.color,
-				isSharedWithMe: calendar.isSharedWithMe,
-				owner: calendar.owner,
-			}
+			return calendar
+				? {
+					id: calendar.url,
+					displayName: calendar.displayName,
+					color: calendar.color,
+					isSharedWithMe: calendar.isSharedWithMe,
+					owner: calendar.owner,
+				}
+				: null
 		},
 
 		/**