Merge branch 'Angtrim-feature-rules' into edge

4 files changed, 27 insertions, 7 deletions

diff --git a/client/components/rules/triggers/boardTriggers.jade b/client/components/rules/triggers/boardTriggers.jade
index 266f11f8..48b9345c 100644
--- a/client/components/rules/triggers/boardTriggers.jade
+++ b/client/components/rules/triggers/boardTriggers.jade
@@ -30,6 +30,13 @@ template(name="boardTriggers")
   div.trigger-item
     div.trigger-content
       div.trigger-text 
+        | {{_'r-when-a-card-is-moved'}}
+    div.trigger-button.js-add-gen-moved-trigger.js-goto-action
+      i.fa.fa-plus
+
+  div.trigger-item
+    div.trigger-content
+      div.trigger-text 
         | {{_'r-when-a-card-is'}}
       div.trigger-dropdown
         select(id="move-action")
diff --git a/client/components/rules/triggers/boardTriggers.js b/client/components/rules/triggers/boardTriggers.js
index e4753642..40c5b07e 100644
--- a/client/components/rules/triggers/boardTriggers.js
+++ b/client/components/rules/triggers/boardTriggers.js
@@ -76,6 +76,19 @@ BlazeComponent.extendComponent({
           });
         }
       },
+      'click .js-add-gen-moved-trigger' (event){
+        const datas = this.data();
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const boardId = Session.get('currentBoard');
+
+        datas.triggerVar.set({
+          activityType: 'moveCard',
+          boardId,
+          'listName':'*',
+          'oldListName': '*',
+          desc,
+        });
+      },
       'click .js-add-arc-trigger' (event) {
         const datas = this.data();
         const desc = Utils.getTriggerActionDesc(event, this);
diff --git a/client/components/rules/triggers/cardTriggers.js b/client/components/rules/triggers/cardTriggers.js
index 704c7690..2303a85b 100644
--- a/client/components/rules/triggers/cardTriggers.js
+++ b/client/components/rules/triggers/cardTriggers.js
@@ -67,7 +67,7 @@ BlazeComponent.extendComponent({
           datas.triggerVar.set({
             activityType: 'joinMember',
             boardId,
-            'memberId': '*',
+            'username': '*',
             desc,
           });
         }
@@ -75,7 +75,7 @@ BlazeComponent.extendComponent({
           datas.triggerVar.set({
             activityType: 'unjoinMember',
             boardId,
-            'memberId': '*',
+            'username': '*',
             desc,
           });
         }
@@ -84,13 +84,13 @@ BlazeComponent.extendComponent({
         const desc = Utils.getTriggerActionDesc(event, this);
         const datas = this.data();
         const actionSelected = this.find('#spec-member-action').value;
-        const memberId = this.find('#spec-member').value;
+        const username = this.find('#spec-member').value;
         const boardId = Session.get('currentBoard');
         if (actionSelected === 'added') {
           datas.triggerVar.set({
             activityType: 'joinMember',
             boardId,
-            memberId,
+            username,
             desc,
           });
         }
@@ -98,7 +98,7 @@ BlazeComponent.extendComponent({
           datas.triggerVar.set({
             activityType: 'unjoinMember',
             boardId,
-            memberId,
+            username,
             desc,
           });
         }
diff --git a/client/components/rules/triggers/checklistTriggers.js b/client/components/rules/triggers/checklistTriggers.js
index 01f3effe..2272be29 100644
--- a/client/components/rules/triggers/checklistTriggers.js
+++ b/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,