zahmis 5 лет назад
Родитель
Сommit
9fd8fa3c03

+ 2 - 2
src/client/js/components/Page/PageManagement.jsx

@@ -15,7 +15,7 @@ import CreateTemplateModal from '../CreateTemplateModal';
 const PageManagement = (props) => {
   const { t, appContainer, pageContainer } = props;
   const {
-    path, isDeletable, isAbleToDeleteCompletely, pageId,
+    path, isDeletable, isAbleToDeleteCompletely, page, pageId,
   } = pageContainer.state;
 
   const { currentUser } = appContainer;
@@ -38,7 +38,7 @@ const PageManagement = (props) => {
   async function openPageDuplicateModalHandler() {
     setIsPageDuplicateModalShown(true);
     try {
-      const res = await appContainer.apiv3Get('/pages/duplicate', { pageId });
+      const res = await appContainer.apiv3Get('/pages/duplicate', { path });
       setDuplicateModalPaths(res.data.duplicatePaths);
     }
     catch (err) {

+ 7 - 9
src/server/routes/apiv3/pages.js

@@ -93,17 +93,15 @@ module.exports = (crowi) => {
   });
 
   router.get('/duplicate', accessTokenParser, loginRequired, validator.duplicate, async(req, res) => {
-    const { pageId } = req.query;
+    const { path } = req.query;
 
-    const page = await Page.findByIdAndViewer(pageId, req.user);
+    const result = await Page.findListWithDescendants(path, req.user);
+    const pages = result.pages;
+    const duplicatePaths = pages.map(element => element.path);
 
-    // const searchWord = new RegExp(`^${path}`);
-    // const duplicateData = await Page.find({ path: searchWord });
-    // const duplicatePaths = duplicateData.map(element => element.path);
-    // console.log(duplicatePaths);
-    // console.log(pageId);
-    console.log(page);
-    return res.apiv3({ page });
+    console.log(duplicatePaths);
+    console.log(req.user);
+    return res.apiv3({ });
   });
 
   return router;