itizawa 5 лет назад
Родитель
Сommit
59e7ba1efb
2 измененных файлов с 12 добавлено и 10 удалено
  1. 3 3
      src/client/js/components/PageHistory.jsx
  2. 9 7
      src/server/routes/apiv3/revisions.js

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

@@ -47,11 +47,11 @@ class PageHistory extends React.Component {
     finally {
     finally {
       this.setState({ isLoading: false });
       this.setState({ isLoading: false });
     }
     }
-
-    const rev = res.revisions;
+    const rev = res.data.revisions;
     const diffOpened = {};
     const diffOpened = {};
     const lastId = rev.length - 1;
     const lastId = rev.length - 1;
-    res.revisions.forEach((revision, i) => {
+
+    res.data.revisions.forEach((revision, i) => {
       const user = revision.author;
       const user = revision.author;
       if (user) {
       if (user) {
         rev[i].author = user;
         rev[i].author = user;

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

@@ -1,10 +1,8 @@
 const loggerFactory = require('@alias/logger');
 const loggerFactory = require('@alias/logger');
 
 
-const logger = loggerFactory('growi:routes:apiv3:pages'); // eslint-disable-line no-unused-vars
+const logger = loggerFactory('growi:routes:apiv3:pages');
 
 
 const express = require('express');
 const express = require('express');
-const certifySharedPage = require('../../middlewares/certify-shared-page');
-const accessTokenParser = require('../../middlewares/access-token-parser');
 
 
 const ErrorV3 = require('../../models/vo/error-apiv3');
 const ErrorV3 = require('../../models/vo/error-apiv3');
 
 
@@ -16,10 +14,14 @@ const router = express.Router();
  *    name: Revisions
  *    name: Revisions
  */
  */
 module.exports = (crowi) => {
 module.exports = (crowi) => {
-  const loginRequired = require('../../middlewares/login-required')(crowi, true);
+  const certifySharedPage = require('../../middlewares/certify-shared-file')(crowi);
+  const accessTokenParser = require('../../middlewares/access-token-parser')(crowi);
+  const loginRequired = require('../../middlewares/login-required')(crowi);
 
 
-  const Page = crowi.model('Page');
-  const Revision = crowi.model('Revision');
+  const {
+    Revision,
+    Page,
+  } = crowi.models;
 
 
   /**
   /**
    * @swagger
    * @swagger
@@ -50,7 +52,7 @@ module.exports = (crowi) => {
     catch (err) {
     catch (err) {
       const msg = 'Error occurred in getting revisions by poge id';
       const msg = 'Error occurred in getting revisions by poge id';
       logger.error('Error', err);
       logger.error('Error', err);
-      return res.apiv3Err(new ErrorV3(msg, 'faild-to-find-revisions'), 403);
+      return res.apiv3Err(new ErrorV3(msg, 'faild-to-find-revisions'), 500);
     }
     }
 
 
   });
   });