Просмотр исходного кода

Fix logic for user homepage deletion checks in PageService

Shun Miyazawa 3 месяцев назад
Родитель
Сommit
b9ae60adb3
1 измененных файлов с 5 добавлено и 9 удалено
  1. 5 9
      apps/app/src/server/service/page/index.ts

+ 5 - 9
apps/app/src/server/service/page/index.ts

@@ -630,16 +630,12 @@ class PageService implements IPageService {
       return await this.isUsersHomepageOwnerAbsent(page.path);
     })();
 
-    const isDeletable = canDeleteUserHomepage;
-    this.canDelete(page, creatorId, user, false) && canDeleteUserHomepage;
+    const isDeletable =
+      canDeleteUserHomepage && this.canDelete(page, creatorId, user, false);
+
     const isAbleToDeleteCompletely =
-      this.canDeleteCompletely(
-        page,
-        creatorId,
-        user,
-        false,
-        userRelatedGroups,
-      ) && canDeleteUserHomepage; // use normal delete config
+      canDeleteUserHomepage &&
+      this.canDeleteCompletely(page, creatorId, user, false, userRelatedGroups); // use normal delete config
 
     const isBookmarked: boolean = isGuestUser
       ? false