浏览代码

corresponds ACL refactoring when accessing to /_api/revisions.get

Yuki Takei 7 年之前
父节点
当前提交
28517a06e4
共有 2 个文件被更改,包括 6 次插入4 次删除
  1. 5 3
      src/client/js/components/PageHistory.js
  2. 1 1
      src/server/routes/revision.js

+ 5 - 3
src/client/js/components/PageHistory.js

@@ -97,7 +97,9 @@ class PageHistory extends React.Component {
       return ;
       return ;
     }
     }
 
 
-    this.props.crowi.apiGet('/revisions.get', {revision_id: revision._id})
+    this.props.crowi.apiGet('/revisions.get',
+      { page_id: this.props.pageId, revision_id: revision._id}
+    )
     .then(res => {
     .then(res => {
       if (res.ok) {
       if (res.ok) {
         this.setState({
         this.setState({
@@ -110,10 +112,10 @@ class PageHistory extends React.Component {
           })
           })
         });
         });
       }
       }
-    }).catch(err => {
+    })
+    .catch(err => {
 
 
     });
     });
-
   }
   }
 
 
   render() {
   render() {

+ 1 - 1
src/server/routes/revision.js

@@ -33,7 +33,7 @@ module.exports = function(crowi, app) {
     }
     }
 
 
     try {
     try {
-      const revision = await Revision.findById(revisionId);
+      const revision = await Revision.findById(revisionId).populate('author', 'User');
       return res.json(ApiResponse.success({ revision }));
       return res.json(ApiResponse.success({ revision }));
     }
     }
     catch (err) {
     catch (err) {