ソースを参照

Move every Checklists.findOne() to the ReactiveCache

Martin Filser 2 年 前
コミット
bf27ffb92e
3 ファイル変更5 行追加5 行削除
  1. 1 1
      models/activities.js
  2. 3 3
      models/checklistItems.js
  3. 1 1
      server/rulesHelper.js

+ 1 - 1
models/activities.js

@@ -47,7 +47,7 @@ Activities.helpers({
     return ReactiveCache.getAttachment(this.attachmentId);
     return ReactiveCache.getAttachment(this.attachmentId);
   },
   },
   checklist() {
   checklist() {
-    return Checklists.findOne(this.checklistId);
+    return ReactiveCache.getChecklist(this.checklistId);
   },
   },
   checklistItem() {
   checklistItem() {
     return ReactiveCache.getChecklistItem(this.checklistItemId);
     return ReactiveCache.getChecklistItem(this.checklistItemId);

+ 3 - 3
models/checklistItems.js

@@ -102,7 +102,7 @@ ChecklistItems.mutations({
     return { $set: { isFinished: !this.isFinished } };
     return { $set: { isFinished: !this.isFinished } };
   },
   },
   move(checklistId, sortIndex) {
   move(checklistId, sortIndex) {
-    const cardId = Checklists.findOne(checklistId).cardId;
+    const cardId = ReactiveCache.getChecklist(checklistId).cardId;
     const mutatedFields = {
     const mutatedFields = {
       cardId,
       cardId,
       checklistId,
       checklistId,
@@ -163,7 +163,7 @@ function publishChekListCompleted(userId, doc) {
   const card = ReactiveCache.getCard(doc.cardId);
   const card = ReactiveCache.getCard(doc.cardId);
   const boardId = card.boardId;
   const boardId = card.boardId;
   const checklistId = doc.checklistId;
   const checklistId = doc.checklistId;
-  const checkList = Checklists.findOne({ _id: checklistId });
+  const checkList = ReactiveCache.getChecklist(checklistId);
   if (checkList.isFinished()) {
   if (checkList.isFinished()) {
     const act = {
     const act = {
       userId,
       userId,
@@ -183,7 +183,7 @@ function publishChekListUncompleted(userId, doc) {
   const card = ReactiveCache.getCard(doc.cardId);
   const card = ReactiveCache.getCard(doc.cardId);
   const boardId = card.boardId;
   const boardId = card.boardId;
   const checklistId = doc.checklistId;
   const checklistId = doc.checklistId;
-  const checkList = Checklists.findOne({ _id: checklistId });
+  const checkList = ReactiveCache.getChecklist(checklistId);
   // BUGS in IFTTT Rules: https://github.com/wekan/wekan/issues/1972
   // BUGS in IFTTT Rules: https://github.com/wekan/wekan/issues/1972
   //       Currently in checklist all are set as uncompleted/not checked,
   //       Currently in checklist all are set as uncompleted/not checked,
   //       IFTTT Rule does not move card to other list.
   //       IFTTT Rule does not move card to other list.

+ 1 - 1
server/rulesHelper.js

@@ -338,7 +338,7 @@ RulesHelper = {
         sort: 0,
         sort: 0,
       });
       });
       const itemsArray = action.checklistItems.split(',');
       const itemsArray = action.checklistItems.split(',');
-      const checkList = Checklists.findOne({ _id: checkListId });
+      const checkList = ReactiveCache.getChecklist(checkListId);
       for (let i = 0; i < itemsArray.length; i++) {
       for (let i = 0; i < itemsArray.length; i++) {
         ChecklistItems.insert({
         ChecklistItems.insert({
           title: itemsArray[i],
           title: itemsArray[i],