Shun Miyazawa 3 ani în urmă
părinte
comite
2ae1cc0856

+ 8 - 10
packages/app/src/components/PageRenameModal.tsx

@@ -2,25 +2,23 @@ import React, {
   useState, useEffect, useCallback, useMemo,
   useState, useEffect, useCallback, useMemo,
 } from 'react';
 } from 'react';
 
 
+import { pagePathUtils } from '@growi/core';
+import { useTranslation } from 'react-i18next';
 import {
 import {
   Collapse, Modal, ModalHeader, ModalBody, ModalFooter,
   Collapse, Modal, ModalHeader, ModalBody, ModalFooter,
 } from 'reactstrap';
 } from 'reactstrap';
-
-import { useTranslation } from 'react-i18next';
-
 import { debounce } from 'throttle-debounce';
 import { debounce } from 'throttle-debounce';
-import { pagePathUtils } from '@growi/core';
-import { usePageRenameModal } from '~/stores/modal';
-import { toastError } from '~/client/util/apiNotification';
 
 
+import { toastError } from '~/client/util/apiNotification';
 import { apiv3Get, apiv3Put } from '~/client/util/apiv3-client';
 import { apiv3Get, apiv3Put } from '~/client/util/apiv3-client';
-
-import ApiErrorMessageList from './PageManagement/ApiErrorMessageList';
-import DuplicatedPathsTable from './DuplicatedPathsTable';
-import { useSiteUrl } from '~/stores/context';
 import { isIPageInfoForEntity } from '~/interfaces/page';
 import { isIPageInfoForEntity } from '~/interfaces/page';
+import { useSiteUrl } from '~/stores/context';
+import { usePageRenameModal } from '~/stores/modal';
 import { useSWRxPageInfo } from '~/stores/page';
 import { useSWRxPageInfo } from '~/stores/page';
 
 
+import DuplicatedPathsTable from './DuplicatedPathsTable';
+import ApiErrorMessageList from './PageManagement/ApiErrorMessageList';
+
 
 
 const isV5Compatible = (meta: unknown): boolean => {
 const isV5Compatible = (meta: unknown): boolean => {
   return isIPageInfoForEntity(meta) ? meta.isV5Compatible : true;
   return isIPageInfoForEntity(meta) ? meta.isV5Compatible : true;

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

@@ -475,9 +475,9 @@ module.exports = (crowi) => {
     try {
     try {
       const fromPage = await Page.findByPath(fromPath);
       const fromPage = await Page.findByPath(fromPath);
 
 
-      if (fromPage == null) {
-        return res.apiv3({ existPaths: [] });
-      }
+      // if (fromPage == null) {
+      //   return res.apiv3({ existPaths: [] });
+      // }
 
 
       const fromPageDescendants = await Page.findManageableListWithDescendants(fromPage, req.user);
       const fromPageDescendants = await Page.findManageableListWithDescendants(fromPage, req.user);