yuto-oweseek 4 лет назад
Родитель
Сommit
32782e9cb6

+ 2 - 2
packages/app/src/components/TagsList.jsx

@@ -40,11 +40,11 @@ class TagsList extends React.Component {
 
   async getTagList(selectPageNumber) {
     const limit = this.state.pagingLimit;
-    const skip = (selectPageNumber - 1) * limit;
+    const offset = (selectPageNumber - 1) * limit;
     let res;
 
     try {
-      res = await apiGet('/tags.list', { limit, skip });
+      res = await apiGet('/tags.list', { limit, offset });
     }
     catch (error) {
       toastError(error);

+ 2 - 2
packages/app/src/server/models/page-tag-relation.js

@@ -48,7 +48,7 @@ class PageTagRelation {
   static async createTagListWithCount(option) {
     const opt = option || {};
     const sortOpt = opt.sortOpt || {};
-    const skip = opt.skip;
+    const offset = opt.offset;
     const limit = opt.limit;
 
     const tags = await this.aggregate()
@@ -62,7 +62,7 @@ class PageTagRelation {
       .unwind('$tag')
       .group({ _id: '$relatedTag', count: { $sum: 1 }, name: { $first: '$tag.name' } })
       .sort(sortOpt)
-      .skip(skip)
+      .skip(offset)
       .limit(limit);
 
     const totalCount = (await this.find({ isPageTrashed: false }).distinct('relatedTag')).length;

+ 2 - 2
packages/app/src/server/routes/tag.js

@@ -214,9 +214,9 @@ module.exports = function(crowi, app) {
    */
   api.list = async function(req, res) {
     const limit = +req.query.limit || 50;
-    const skip = +req.query.skip || 0;
+    const offset = +req.query.offset || 0;
     const sortOpt = { count: -1, _id: -1 };
-    const queryOptions = { skip, limit, sortOpt };
+    const queryOptions = { offset, limit, sortOpt };
 
     try {
       // get tag list contains id name and count properties