Browse Source

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

Martin Filser 2 years ago
parent
commit
47c70f03a2

+ 3 - 3
client/components/lists/listBody.js

@@ -16,10 +16,11 @@ BlazeComponent.extendComponent({
   },
   },
 
 
   customFieldsSum() {
   customFieldsSum() {
-    return CustomFields.find({
+    const ret = ReactiveCache.getCustomFields({
       boardIds: { $in: [Session.get('currentBoard')] },
       boardIds: { $in: [Session.get('currentBoard')] },
       showSumAtTopOfList: true,
       showSumAtTopOfList: true,
     });
     });
+    return ret;
   },
   },
 
 
   openForm(options) {
   openForm(options) {
@@ -269,8 +270,7 @@ BlazeComponent.extendComponent({
     arr = [];
     arr = [];
     _.forEach(
     _.forEach(
       ReactiveCache.getBoard(currentBoardId)
       ReactiveCache.getBoard(currentBoardId)
-        .customFields()
-        .fetch(),
+        .customFields(),
       function (field) {
       function (field) {
         if (field.automaticallyOnCard || field.alwaysOnCard)
         if (field.automaticallyOnCard || field.alwaysOnCard)
           arr.push({ _id: field._id, value: null });
           arr.push({ _id: field._id, value: null });

+ 3 - 1
client/components/sidebar/sidebarCustomFields.js

@@ -1,10 +1,12 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import { TAPi18n } from '/imports/i18n';
 import { TAPi18n } from '/imports/i18n';
 
 
 BlazeComponent.extendComponent({
 BlazeComponent.extendComponent({
   customFields() {
   customFields() {
-    return CustomFields.find({
+    const ret = ReactiveCache.getCustomFields({
       boardIds: { $in: [Session.get('currentBoard')] },
       boardIds: { $in: [Session.get('currentBoard')] },
     });
     });
+    return ret;
   },
   },
 
 
   events() {
   events() {