Fixed rules about member and box dropdowns width

client/components/rules/actions/cardActions.js

@@ -58,14 +58,14 @@ BlazeComponent.extendComponent({
         const ruleName = this.data().ruleName.get();
         const trigger = this.data().triggerVar.get();
         const actionSelected = this.find('#member-action').value;
-        const memberName = this.find('#member-name').value;
+        const username = this.find('#member-name').value;
         const boardId = Session.get('currentBoard');
         const desc = Utils.getTriggerActionDesc(event, this);
         if (actionSelected === 'add') {
           const triggerId = Triggers.insert(trigger);
           const actionId = Actions.insert({
             actionType: 'addMember',
-            memberName,
+            username,
             boardId,
             desc,
           });
@@ -81,7 +81,7 @@ BlazeComponent.extendComponent({
           const triggerId = Triggers.insert(trigger);
           const actionId = Actions.insert({
             actionType: 'removeMember',
-            memberName,
+            username,
             boardId,
             desc,
           });
@@ -101,7 +101,7 @@ BlazeComponent.extendComponent({
         const boardId = Session.get('currentBoard');
         const actionId = Actions.insert({
           actionType: 'removeMember',
-          'memberName': '*',
+          'username': '*',
           boardId,
           desc,
         });

client/components/rules/rules.styl

@@ -116,7 +116,7 @@
             .trigger-dropdown
               display:inline-block
               select
-                width:100px
+                width:auto
                 height:30px
                 margin:0px
                 margin-left:5px

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,
           });
         }

i18n/en.i18n.json

@@ -548,7 +548,7 @@
     "r-when-the-label-is": "When the label is",
     "r-list-name": "List name",
     "r-when-a-member": "When a member is",
-    "r-when-the-member": "When the member is",
+    "r-when-the-member": "When the member",
     "r-name": "name",
     "r-is": "is",
     "r-when-a-attach": "When an attachment",

models/cards.js

@@ -1165,10 +1165,11 @@ function cardMembers(userId, doc, fieldNames, modifier) {
   // Say hello to the new member
   if (modifier.$addToSet && modifier.$addToSet.members) {
     memberId = modifier.$addToSet.members;
+    let username = Users.findOne(memberId).username;
     if (!_.contains(doc.members, memberId)) {
       Activities.insert({
         userId,
-        memberId,
+        username,
         activityType: 'joinMember',
         boardId: doc.boardId,
         cardId: doc._id,
@@ -1179,11 +1180,12 @@ function cardMembers(userId, doc, fieldNames, modifier) {
   // Say goodbye to the former member
   if (modifier.$pull && modifier.$pull.members) {
     memberId = modifier.$pull.members;
+    let username = Users.findOne(memberId).username;
     // Check that the former member is member of the card
     if (_.contains(doc.members, memberId)) {
       Activities.insert({
         userId,
-        memberId,
+        username,
         activityType: 'unjoinMember',
         boardId: doc.boardId,
         cardId: doc._id,

server/rulesHelper.js

@@ -87,7 +87,7 @@ RulesHelper = {
       card.removeLabel(action.labelId);
     }
     if(action.actionType === 'addMember'){
-      const memberId = Users.findOne({username:action.memberName})._id;
+      const memberId = Users.findOne({username:action.username})._id;
       card.assignMember(memberId);
     }
     if(action.actionType === 'removeMember'){
@@ -97,7 +97,7 @@ RulesHelper = {
           card.unassignMember(members[i]);
         }
       }else{
-        const memberId = Users.findOne({username:action.memberName})._id;
+        const memberId = Users.findOne({username:action.username})._id;
         card.unassignMember(memberId);
       }
     }

server/triggersDef.js

@@ -12,10 +12,10 @@ TriggersDef = {
     matchingFields: ['boardId'],
   },
   joinMember:{
-    matchingFields: ['boardId', 'memberId'],
+    matchingFields: ['boardId', 'username'],
   },
   unjoinMember:{
-    matchingFields: ['boardId', 'memberId'],
+    matchingFields: ['boardId', 'username'],
   },
   addChecklist:{
     matchingFields: ['boardId', 'checklistName'],