zahmis 5 лет назад
Родитель
Сommit
5efcb6d345

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

@@ -54,6 +54,7 @@ function PageHistory(props) {
   }
   }
 
 
   function pager() {
   function pager() {
+
     return (
     return (
       <PaginationWrapper
       <PaginationWrapper
         activePage={activePage}
         activePage={activePage}
@@ -73,6 +74,7 @@ function PageHistory(props) {
         getPreviousRevision={getPreviousRevision}
         getPreviousRevision={getPreviousRevision}
         onDiffOpenClicked={onDiffOpenClicked}
         onDiffOpenClicked={onDiffOpenClicked}
       />
       />
+      {console.log(pagingLimit)}
       {pager()}
       {pager()}
     </div>
     </div>
   );
   );

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

@@ -28,7 +28,7 @@ export default class PageHistoryContainer extends Container {
 
 
       totalPages: 0,
       totalPages: 0,
       activePage: 1,
       activePage: 1,
-      pagingLimit: this.appContainer.getConfig().pageLimitationS || 10,
+      pagingLimit: Infinity,
     };
     };
 
 
     this.retrieveRevisions = this.retrieveRevisions.bind(this);
     this.retrieveRevisions = this.retrieveRevisions.bind(this);
@@ -50,21 +50,20 @@ export default class PageHistoryContainer extends Container {
    */
    */
   async retrieveRevisions(selectedPage) {
   async retrieveRevisions(selectedPage) {
     const { pageId, shareLinkId } = this.pageContainer.state;
     const { pageId, shareLinkId } = this.pageContainer.state;
-    const { pagingLimit } = this.state;
 
 
     if (!pageId) {
     if (!pageId) {
       return;
       return;
     }
     }
 
 
     const res = await this.appContainer.apiv3Get('/revisions/list', {
     const res = await this.appContainer.apiv3Get('/revisions/list', {
-      pageId, shareLinkId, selectedPage, pagingLimit,
+      pageId, shareLinkId, selectedPage,
     });
     });
     const rev = res.data.docs;
     const rev = res.data.docs;
-
     // set Pagination state
     // set Pagination state
     this.setState({
     this.setState({
       activePage: selectedPage,
       activePage: selectedPage,
       totalPages: res.data.totalDocs,
       totalPages: res.data.totalDocs,
+      pagingLimit: res.data.limit,
     });
     });
 
 
     const diffOpened = {};
     const diffOpened = {};

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

@@ -97,7 +97,7 @@ module.exports = (crowi) => {
    */
    */
   router.get('/list', certifySharedPage, accessTokenParser, loginRequired, validator.retrieveRevisions, apiV3FormValidator, async(req, res) => {
   router.get('/list', certifySharedPage, accessTokenParser, loginRequired, validator.retrieveRevisions, apiV3FormValidator, async(req, res) => {
     const pageId = req.query.pageId;
     const pageId = req.query.pageId;
-    const pagingLimit = req.query.pagingLimit || 10;
+    const pageLimitationS = req.query.pageLimitationS || await crowi.configManager.getConfig('crowi', 'customize:showPageLimitationS') || 10;
     const { isSharedPage } = req;
     const { isSharedPage } = req;
 
 
     const selectedPage = parseInt(req.query.selectedPage) || 1;
     const selectedPage = parseInt(req.query.selectedPage) || 1;
@@ -114,7 +114,7 @@ module.exports = (crowi) => {
         { path: page.path },
         { path: page.path },
         {
         {
           page: selectedPage,
           page: selectedPage,
-          limit: pagingLimit,
+          limit: pageLimitationS,
           sort: { createdAt: -1 },
           sort: { createdAt: -1 },
           populate: {
           populate: {
             path: 'author',
             path: 'author',