zahmis 5 лет назад
Родитель
Сommit
a53a37cc5e
2 измененных файлов с 13 добавлено и 5 удалено
  1. 1 1
      src/client/js/components/PageDuplicateModal.jsx
  2. 12 4
      src/server/routes/apiv3/pages.js

+ 1 - 1
src/client/js/components/PageDuplicateModal.jsx

@@ -61,7 +61,7 @@ const PageDuplicateModal = (props) => {
   }, [appContainer, path, t]);
 
   useEffect(() => {
-    if (props.isOpen === true) {
+    if (props.isOpen) {
       getSubordinatedList();
     }
   }, [props.isOpen, getSubordinatedList]);

+ 12 - 4
src/server/routes/apiv3/pages.js

@@ -86,13 +86,21 @@ module.exports = (crowi) => {
   router.get('/subordinated-list', accessTokenParser, loginRequired, async(req, res) => {
     const { path } = req.query;
 
-    const pageData = await Page.findByPath(path);
+    try {
+      const pageData = await Page.findByPath(path);
+
+      const result = await Page.findManageableListWithDescendants(pageData, req.user);
 
-    const result = await Page.findManageableListWithDescendants(pageData, req.user);
+      const resultPaths = result.map(element => element.path);
 
-    const resultPaths = result.map(element => element.path);
+      return res.apiv3({ resultPaths });
+    }
+    catch (err) {
+      res.code = 'unknown';
+      logger.error('Failed to find the path', err);
+      return res.apiv3Err(err, 500);
+    }
 
-    return res.apiv3({ resultPaths });
   });
   return router;
 };