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

GC-1184: include restriction for pages to ES index

* BugFix
Yuki Takei 7 лет назад
Родитель
Сommit
5bce7265c8
1 измененных файлов с 7 добавлено и 7 удалено
  1. 7 7
      src/server/util/search.js

+ 7 - 7
src/server/util/search.js

@@ -129,24 +129,24 @@ SearchClient.prototype.deleteIndex = function(uri) {
  * generate object that is related to page.grant*
  * generate object that is related to page.grant*
  */
  */
 function generateDocContentsRelatedToRestriction(page) {
 function generateDocContentsRelatedToRestriction(page) {
-  let grantedUsers = null;
-  if (page.grantedUsers != null) {
-    grantedUsers = page.grantedUsers.map(user => {
+  let grantedUserIds = null;
+  if (page.grantedUsers != null && page.grantedUsers.length > 0) {
+    grantedUserIds = page.grantedUsers.map(user => {
       const userId = (user._id == null) ? user : user._id;
       const userId = (user._id == null) ? user : user._id;
       return userId.toString();
       return userId.toString();
     });
     });
   }
   }
 
 
-  let grantedGroup = null;
+  let grantedGroupId = null;
   if (page.grantedGroup != null) {
   if (page.grantedGroup != null) {
     const groupId = (page.grantedGroup._id == null) ? page.grantedGroup : page.grantedGroup._id;
     const groupId = (page.grantedGroup._id == null) ? page.grantedGroup : page.grantedGroup._id;
-    return groupId.toString();
+    grantedGroupId = groupId.toString();
   }
   }
 
 
   return {
   return {
     grant: page.grant,
     grant: page.grant,
-    granted_users: grantedUsers,
-    granted_group: grantedGroup,
+    granted_users: grantedUserIds,
+    granted_group: grantedGroupId,
   };
   };
 }
 }