Fixed board id bug in move

client/components/rules/rulesList.js

@@ -4,7 +4,8 @@ BlazeComponent.extendComponent({
   },
 
   rules() {
-    return Rules.find({});
+  	const boardId = Session.get('currentBoard');
+    return Rules.find({"boardId":boardId});
   },
   events() {
     return [{}];

i18n/en.i18n.json

@@ -548,7 +548,7 @@
     "r-completed": "Completed",
     "r-made-incomplete": "Made incomplete",
     "r-when-a-item": "When a checklist item is",
-    "r-when-the-item": "When the checklist item is",
+    "r-when-the-item": "When the checklist item",
     "r-checked": "Checked",
     "r-unchecked": "Unchecked",
     "r-move-card-to": "Move card to",

server/rulesHelper.js

@@ -40,6 +40,7 @@ RulesHelper = {
 		console.log("Performing action - Action");
 		console.log(action);
 		const card = Cards.findOne({_id:activity.cardId});
+		const boardId = activity.boardId;
 		if(action.actionType == "moveCardToTop"){
 			let listId;
 			let list;
@@ -47,7 +48,7 @@ RulesHelper = {
 				listId = card.swimlaneId;
 				list = card.list();
 			}else{
-				list = Lists.findOne({title: action.listTitle});
+				list = Lists.findOne({title: action.listTitle, boardId:boardId });;
 				listId = list._id;
 			}
 			const minOrder = _.min(list.cards(card.swimlaneId).map((c) => c.sort));
@@ -60,7 +61,7 @@ RulesHelper = {
 				listId = card.swimlaneId;
 				list = card.list();
 			}else{
-				list = Lists.findOne({title: action.listTitle});
+				list = Lists.findOne({title: action.listTitle, boardId:boardId});
 				listId = list._id;
 			}
 			const maxOrder = _.max(list.cards(card.swimlaneId).map((c) => c.sort));