Просмотр исходного кода

Merge branch 'imprv/my-bookmark-page-list-api' into imprv/bookmark-list-appearance

# Conflicts:
#	src/server/routes/apiv3/bookmarks.js
ryuichi-e 5 лет назад
Родитель
Сommit
1035d4aa59
1 измененных файлов с 5 добавлено и 3 удалено
  1. 5 3
      src/server/routes/apiv3/bookmarks.js

+ 5 - 3
src/server/routes/apiv3/bookmarks.js

@@ -105,12 +105,14 @@ module.exports = (crowi) => {
 
   // select page from bookmark where userid = userid
 
-  router.get('/byUser', /* accessTokenParser, loginRequired, csrf, */ apiV3FormValidator, async(req, res) => {
-    const { userId } = req.query;
+  router.get('/:userId', /* accessTokenParser, loginRequired, csrf, */ apiV3FormValidator, async(req, res) => {
+    const { userId } = req.params;
+    // const limit = parseInt(req.query.limit) || 10;
     try {
       const bookmarks = await Bookmark
         .find({ user: userId })
-        .populate({ path: 'page', model: 'Page' });
+        .populate({ path: 'page', model: 'Page' })
+        /* .limit(limit) */;
       const pageList = bookmarks.map((bookmark) => {
         return bookmark.page;
       });