zahmis 5 rokov pred
rodič
commit
532549f144

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

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

+ 2 - 1
src/server/routes/apiv3/pages.js

@@ -83,11 +83,12 @@ module.exports = (crowi) => {
   });
 
   router.get('/duplicate', loginRequired, async(req, res) => {
-    const { path } = req.query;
+    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 });
   });