浏览代码

Fixed some rules

Angelo Gallarello 6 年之前
父节点
当前提交
37a53e7466
共有 3 个文件被更改,包括 8 次插入8 次删除
  1. 2 2
      client/components/rules/triggers/checklistTriggers.js
  2. 2 2
      models/checklistItems.js
  3. 4 4
      server/rulesHelper.js

+ 2 - 2
client/components/rules/triggers/checklistTriggers.js

@@ -78,7 +78,7 @@ BlazeComponent.extendComponent({
         const actionSelected = this.find('#spec-comp-check-action').value;
         const checklistId = this.find('#spec-comp-check-name').value;
         const boardId = Session.get('currentBoard');
-        if (actionSelected === 'added') {
+        if (actionSelected === 'completed') {
           datas.triggerVar.set({
             activityType: 'completeChecklist',
             boardId,
@@ -86,7 +86,7 @@ BlazeComponent.extendComponent({
             desc,
           });
         }
-        if (actionSelected === 'removed') {
+        if (actionSelected === 'uncompleted') {
           datas.triggerVar.set({
             activityType: 'uncompleteChecklist',
             boardId,

+ 2 - 2
models/checklistItems.js

@@ -130,7 +130,7 @@ function publishChekListCompleted(userId, doc, fieldNames, modifier){
       cardId: doc.cardId,
       boardId,
       checklistId: doc.checklistId,
-      checklistName:doc.title,
+      checklistName:checkList.title,
     };
     Activities.insert(act);
   }
@@ -148,7 +148,7 @@ function publishChekListUncompleted(userId, doc, fieldNames, modifier){
       cardId: doc.cardId,
       boardId,
       checklistId: doc.checklistId,
-      checklistName:doc.title,
+      checklistName:checkList.title,
     };
     Activities.insert(act);
   }

+ 4 - 4
server/rulesHelper.js

@@ -36,8 +36,8 @@ RulesHelper = {
     if(action.actionType === 'moveCardToTop'){
       let listId;
       let list;
-      if(activity.listTitle === '*'){
-        listId = card.swimlaneId;
+      if(action.listTitle === '*'){
+        listId = card.listId;
         list = card.list();
       }else{
         list = Lists.findOne({title: action.listTitle, boardId });
@@ -49,8 +49,8 @@ RulesHelper = {
     if(action.actionType === 'moveCardToBottom'){
       let listId;
       let list;
-      if(activity.listTitle === '*'){
-        listId = card.swimlaneId;
+      if(action.listTitle === '*'){
+        listId = card.listId;
         list = card.list();
       }else{
         list = Lists.findOne({title: action.listTitle, boardId});