Răsfoiți Sursa

set console

zahmis 5 ani în urmă
părinte
comite
391dbe361a

+ 0 - 1
src/client/js/components/PageHistory.jsx

@@ -14,7 +14,6 @@ import PaginationWrapper from './PaginationWrapper';
 
 const logger = loggerFactory('growi:PageHistory');
 
-// TODO add paging size (limit) for modal
 function PageHistory(props) {
   const { pageHistoryContainer } = props;
 

+ 0 - 1
src/client/js/components/PageTimeline.jsx

@@ -17,7 +17,6 @@ class PageTimeline extends React.Component {
     super(props);
 
     const { appContainer } = this.props;
-    // TODO add paging size (limit) for modal
     this.state = {
       activePage: 1,
       totalPageItems: 0,

+ 4 - 2
src/client/js/services/PageHistoryContainer.js

@@ -16,6 +16,7 @@ export default class PageHistoryContainer extends Container {
     super();
 
     this.appContainer = appContainer;
+
     this.pageContainer = pageContainer;
 
     this.dummyRevisions = 0;
@@ -29,8 +30,9 @@ export default class PageHistoryContainer extends Container {
 
       totalPages: 0,
       activePage: 1,
-      pagingLimit: Infinity,
+      pagingLimit: this.appContainer.getConfig().pageLimitationS,
     };
+    console.log(this.state.pagingLimit);
 
     this.retrieveRevisions = this.retrieveRevisions.bind(this);
     this.onDiffOpenClicked = this.onDiffOpenClicked.bind(this);
@@ -38,6 +40,7 @@ export default class PageHistoryContainer extends Container {
     this.fetchPageRevisionBody = this.fetchPageRevisionBody.bind(this);
   }
 
+
   /**
    * Workaround for the mangling in production build to break constructor.name
    */
@@ -62,7 +65,6 @@ export default class PageHistoryContainer extends Container {
     this.setState({
       activePage: selectedPage,
       totalPages: res.data.totalDocs,
-      pagingLimit: res.data.limit,
     });
 
     const diffOpened = {};

+ 0 - 2
src/server/routes/apiv3/revisions.js

@@ -9,7 +9,6 @@ const ErrorV3 = require('../../models/vo/error-apiv3');
 
 const router = express.Router();
 
-const PAGE_ITEMS = 30;
 
 /**
  * @swagger
@@ -115,7 +114,6 @@ module.exports = (crowi) => {
         { path: page.path },
         {
           page: selectedPage,
-          limit: PAGE_ITEMS,
           sort: { createdAt: -1 },
           populate: {
             path: 'author',