Browse Source

fix pages pageManagement

zahmis 5 years ago
parent
commit
64ab81a832
2 changed files with 12 additions and 8 deletions
  1. 1 1
      src/client/js/components/Page/PageManagement.jsx
  2. 11 7
      src/server/routes/apiv3/pages.js

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

@@ -38,7 +38,7 @@ const PageManagement = (props) => {
   async function openPageDuplicateModalHandler() {
     setIsPageDuplicateModalShown(true);
     try {
-      const res = await appContainer.apiv3Get('/pages/duplicate', { path, pageId });
+      const res = await appContainer.apiv3Get('/pages/duplicate', { pageId });
       setDuplicateModalPaths(res.data.duplicatePaths);
     }
     catch (err) {

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

@@ -93,13 +93,17 @@ module.exports = (crowi) => {
   });
 
   router.get('/duplicate', accessTokenParser, loginRequired, validator.duplicate, async(req, res) => {
-    const { path, pageId } = req.query;
-    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);
-    return res.apiv3({ duplicatePaths });
+    const { pageId } = req.query;
+
+    const page = await Page.findByIdAndViewer(pageId, req.user);
+
+    // 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 });
   });
 
   return router;