Ver Fonte

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

Martin Filser há 2 anos atrás
pai
commit
8c72531e6d

+ 6 - 4
client/components/settings/peopleBody.js

@@ -145,11 +145,11 @@ BlazeComponent.extendComponent({
     this.loading.set(w);
   },
   orgList() {
-    const orgs = Org.find(this.findOrgsOptions.get(), {
+    const orgs = ReactiveCache.getOrgs(this.findOrgsOptions.get(), {
       sort: { orgDisplayName: 1 },
       fields: { _id: true },
     });
-    this.numberOrgs.set(orgs.count(false));
+    this.numberOrgs.set(orgs.length);
     return orgs;
   },
   teamList() {
@@ -253,7 +253,8 @@ Template.editUserPopup.helpers({
     return Template.instance().authenticationMethods.get();
   },
   orgsDatas() {
-    return Org.find({}, {sort: { orgDisplayName: 1 }});
+    const ret = ReactiveCache.getOrgs({}, {sort: { orgDisplayName: 1 }});
+    return ret;
   },
   teamsDatas() {
     return Team.find({}, {sort: { teamDisplayName: 1 }});
@@ -326,7 +327,8 @@ Template.newUserPopup.helpers({
     return Template.instance().authenticationMethods.get();
   },
   orgsDatas() {
-    return Org.find({}, {sort: { orgDisplayName: 1 }});
+    const ret = ReactiveCache.getOrgs({}, {sort: { orgDisplayName: 1 }});
+    return ret;
   },
   teamsDatas() {
     return Team.find({}, {sort: { teamDisplayName: 1 }});

+ 4 - 4
client/components/sidebar/sidebar.js

@@ -374,11 +374,11 @@ Template.membersWidget.helpers({
     return ReactiveCache.getCurrentUser().isBoardAdmin();
   },
   AtLeastOneOrgWasCreated(){
-    let orgs = Org.find({}, {sort: { createdAt: -1 }});
+    let orgs = ReactiveCache.getOrgs({}, {sort: { createdAt: -1 }});
     if(orgs === undefined)
       return false;
 
-    return orgs.count() > 0;
+    return orgs.length > 0;
   },
 
   AtLeastOneTeamWasCreated(){
@@ -1580,8 +1580,8 @@ BlazeComponent.extendComponent({
 
 Template.addBoardOrgPopup.helpers({
   orgsDatas() {
-    let orgs = Org.find({}, {sort: { orgDisplayName: 1 }});
-    return orgs;
+    let ret = ReactiveCache.getOrgs({}, {sort: { orgDisplayName: 1 }});
+    return ret;
   },
 });