Przeglądaj źródła

Merge pull request #10731 from growilabs/imprv/177492-exclude-user-pages-from-bookmark-data-when-user-pages-are-hidden-2

imprv: Exclude user pages from bookmark data when user pages are hidden (2)
Yuki Takei 2 miesięcy temu
rodzic
commit
3062d2a952
1 zmienionych plików z 2 dodań i 1 usunięć
  1. 2 1
      apps/app/src/server/routes/apiv3/bookmarks.ts

+ 2 - 1
apps/app/src/server/routes/apiv3/bookmarks.ts

@@ -247,7 +247,7 @@ module.exports = (crowi) => {
           _id: { $nin: bookmarkIdsInFolders },
           user: userId,
         })
-          .populate<{ page: PageDocument }>({
+          .populate<{ page: PageDocument | null }>({
             path: 'page',
             model: 'Page',
             populate: {
@@ -264,6 +264,7 @@ module.exports = (crowi) => {
         const filteredBookmarks = isHidingUserPages
           ? userRootBookmarks.filter(
               (bookmark) =>
+                bookmark.page != null &&
                 !isUserPage(bookmark.page.path) &&
                 !isUsersTopPage(bookmark.page.path),
             )