ソースを参照

remove condition

yohei0125 4 年 前
コミット
179fe4e365

+ 1 - 4
packages/app/src/components/Common/Dropdown/PageItemControl.tsx

@@ -105,10 +105,7 @@ const PageItemControlDropdownMenu = React.memo((props: DropdownMenuProps): JSX.E
 
 
         {/* Bookmark */}
         {/* Bookmark */}
         { showBookmarkMenuItem && isEnableActions && !pageInfo.isEmpty && isIPageInfoForOperation(pageInfo) && (
         { showBookmarkMenuItem && isEnableActions && !pageInfo.isEmpty && isIPageInfoForOperation(pageInfo) && (
-          <DropdownItem
-            onClick={bookmarkItemClickedHandler}
-            disabled={!pageInfo.isMovable}
-          >
+          <DropdownItem onClick={bookmarkItemClickedHandler}>
             <i className="fa fa-fw fa-bookmark-o"></i>
             <i className="fa fa-fw fa-bookmark-o"></i>
             { pageInfo.isBookmarked ? t('remove_bookmark') : t('add_bookmark') }
             { pageInfo.isBookmarked ? t('remove_bookmark') : t('add_bookmark') }
           </DropdownItem>
           </DropdownItem>

+ 1 - 1
packages/app/src/server/routes/apiv3/page.js

@@ -393,7 +393,7 @@ module.exports = (crowi) => {
 
 
       const isBookmarked = await Bookmark.findByPageIdAndUserId(pageId, user._id);
       const isBookmarked = await Bookmark.findByPageIdAndUserId(pageId, user._id);
       const isLiked = page.isLiked(user);
       const isLiked = page.isLiked(user);
-      const isMovable = !isTopPage(page.path) && !isUserPage(page.path) && !isUserNamePage(page.path) && !page.isEmpty;
+      const isMovable = !isTopPage(page.path) && !isUserPage(page.path) && !isUserNamePage(page.path);
       const isAbleToDeleteCompletely = pageService.canDeleteCompletely(page.creator?._id, user);
       const isAbleToDeleteCompletely = pageService.canDeleteCompletely(page.creator?._id, user);
 
 
       const subscription = await Subscription.findByUserIdAndTargetId(user._id, pageId);
       const subscription = await Subscription.findByUserIdAndTargetId(user._id, pageId);

+ 1 - 1
packages/app/src/server/service/page.ts

@@ -1698,7 +1698,7 @@ class PageService {
       };
       };
     }
     }
 
 
-    const isMovable = isGuestUser ? false : !isTopPage(page.path) && !isUserPage(page.path) && !isUserNamePage(page.path) && !page.isEmpty;
+    const isMovable = isGuestUser ? false : !isTopPage(page.path) && !isUserPage(page.path) && !isUserNamePage(page.path);
 
 
     const likers = page.liker.slice(0, 15) as Ref<IUserHasId>[];
     const likers = page.liker.slice(0, 15) as Ref<IUserHasId>[];
     const seenUsers = page.seenUsers.slice(0, 15) as Ref<IUserHasId>[];
     const seenUsers = page.seenUsers.slice(0, 15) as Ref<IUserHasId>[];