yohei0125 4 лет назад
Родитель
Сommit
60020dc600
2 измененных файлов с 2 добавлено и 2 удалено
  1. 1 1
      packages/app/src/server/routes/apiv3/page.js
  2. 1 1
      packages/app/src/server/service/page.ts

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

@@ -10,7 +10,7 @@ const express = require('express');
 const { body, query } = require('express-validator');
 const { body, query } = require('express-validator');
 
 
 const router = express.Router();
 const router = express.Router();
-const { convertToNewAffiliationPath, isTrashPage } = pagePathUtils;
+const { convertToNewAffiliationPath } = pagePathUtils;
 const ErrorV3 = require('../../models/vo/error-apiv3');
 const ErrorV3 = require('../../models/vo/error-apiv3');
 
 
 
 

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

@@ -1690,7 +1690,6 @@ class PageService {
 
 
   constructBasicPageInfo(page: IPage, isGuestUser?: boolean): IPageInfo | IPageInfoForEntity {
   constructBasicPageInfo(page: IPage, isGuestUser?: boolean): IPageInfo | IPageInfoForEntity {
     const isMovable = isGuestUser ? false : !isTopPage(page.path) && !isUserPage(page.path) && !isUserNamePage(page.path);
     const isMovable = isGuestUser ? false : !isTopPage(page.path) && !isUserPage(page.path) && !isUserNamePage(page.path);
-    const isRevertible = isTrashPage(page.path);
 
 
     if (page.isEmpty) {
     if (page.isEmpty) {
       return {
       return {
@@ -1706,6 +1705,7 @@ class PageService {
     const seenUsers = page.seenUsers.slice(0, 15) as Ref<IUserHasId>[];
     const seenUsers = page.seenUsers.slice(0, 15) as Ref<IUserHasId>[];
 
 
     const Page = this.crowi.model('Page');
     const Page = this.crowi.model('Page');
+    const isRevertible = isTrashPage(page.path);
     return {
     return {
       isEmpty: false,
       isEmpty: false,
       sumOfLikers: page.liker.length,
       sumOfLikers: page.liker.length,