2
0
Эх сурвалжийг харах

Move every Org.find(idOrFirstObjectSelector, options) to the ReactiveCache (directory server/)

Martin Filser 2 жил өмнө
parent
commit
dcf7232958

+ 1 - 1
server/publications/boards.js

@@ -143,7 +143,7 @@ Meteor.publish('boardsReport', function() {
     boards,
     ReactiveCache.getUsers({ _id: { $in: userIds } }, { fields: Users.safeFields }, true),
     Team.find({ _id: { $in: teamIds } }),
-    Org.find({ _id: { $in: orgIds } }),
+    ReactiveCache.getOrgs({ _id: { $in: orgIds } }, {}, true),
   ]
   return ret;
 });

+ 15 - 12
server/publications/org.js

@@ -8,19 +8,22 @@ Meteor.publish('org', function(query, limit) {
   const user = ReactiveCache.getCurrentUser();
 
   if (user && user.isAdmin) {
-    ret = Org.find(query, {
-      limit,
-      sort: { createdAt: -1 },
-      fields: {
-        orgDisplayName: 1,
-        orgDesc: 1,
-        orgShortName: 1,
-        orgWebsite: 1,
-        orgTeams: 1,
-        createdAt: 1,
-        orgIsActive: 1,
+    ret = ReactiveCache.getOrgs(query,
+      {
+        limit,
+        sort: { createdAt: -1 },
+        fields: {
+          orgDisplayName: 1,
+          orgDesc: 1,
+          orgShortName: 1,
+          orgWebsite: 1,
+          orgTeams: 1,
+          createdAt: 1,
+          orgIsActive: 1,
+        }
       },
-    });
+      true,
+    );
   }
 
   return ret;