Merge branch 'master' into manage-holidays

# Conflicts:
#	CHANGELOG.rst

CHANGELOG.rst

@@ -9,6 +9,11 @@ and this project adheres to `Semantic Versioning`_.
 Unreleased
 ----------
 
+Fixed
+~~~~~
+
+* Notifications were not properly shown in the frontend.
+
 
 Added
 ~~~~~

aleksis/core/frontend/components/notifications/NotificationList.vue

@@ -20,7 +20,7 @@
           v-if="
             myNotifications &&
             myNotifications.person &&
-            myNotifications.person.notifications.length > 0
+            unreadNotifications.length > 0
           "
         >
           mdi-bell-badge-outline
@@ -38,7 +38,7 @@
         v-if="
           myNotifications.person &&
           myNotifications.person.notifications &&
-          unreadNotifications.length
+          myNotifications.person.notifications.length
         "
       >
         <v-subheader>{{ $t("notifications.notifications") }}</v-subheader>
@@ -88,7 +88,9 @@ export default {
   },
   computed: {
     unreadNotifications() {
-      return this.myNotifications.filter((n) => !n.read);
+      return this.myNotifications.person.notifications
+        ? this.myNotifications.person.notifications.filter((n) => !n.read)
+        : [];
     },
   },
 };