From 45bb9a929e56ca6600fc3b3e9a61d1ad10242367 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Raimund=20Schl=C3=BC=C3=9Fler?= Date: Sun, 19 Jan 2025 22:55:53 +0100 Subject: [PATCH 1/2] fix: calendar is null in CalendarPickerItem MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Raimund Schlüßler --- src/components/AppSidebar/CalendarPickerItem.vue | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/components/AppSidebar/CalendarPickerItem.vue b/src/components/AppSidebar/CalendarPickerItem.vue index 725a35bfc..8fc033563 100644 --- 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 }, /** From 7dbde83385af8325c54e2e01b60cd968e0ec4b6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Raimund=20Schl=C3=BC=C3=9Fler?= Date: Sun, 19 Jan 2025 22:56:25 +0100 Subject: [PATCH 2/2] fix: bring back task dialog styles for Talk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Raimund Schlüßler --- lib/Listeners/BeforeTemplateRenderedListener.php | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/Listeners/BeforeTemplateRenderedListener.php b/lib/Listeners/BeforeTemplateRenderedListener.php index f7b7b14b7..ae58ed7d0 100644 --- 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'); } }