Merge branch 'feature-rules' of https://github.com/Angtrim/wekan into Angtrim-feature-rules

3 files changed, 17 insertions, 4 deletions

diff --git a/models/cards.js b/models/cards.js
index 346b4bdd..66bfbcf3 100644
--- a/models/cards.js
+++ b/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;
+    const 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;
+    const 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,
diff --git a/models/checklistItems.js b/models/checklistItems.js
index 8380bda7..7132bc7c 100644
--- a/models/checklistItems.js
+++ b/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);
   }
diff --git a/models/lists.js b/models/lists.js
index bf5aae3c..b99fe8f5 100644
--- a/models/lists.js
+++ b/models/lists.js
@@ -82,6 +82,17 @@ Lists.helpers({
     };
     if (swimlaneId)
       selector.swimlaneId = swimlaneId;
+    return Cards.find(Filter.mongoSelector(selector),
+      { sort: ['sort'] });
+  },
+
+  cardsUnfiltered(swimlaneId) {
+    const selector = {
+      listId: this._id,
+      archived: false,
+    };
+    if (swimlaneId)
+      selector.swimlaneId = swimlaneId;
     return Cards.find(selector,
       { sort: ['sort'] });
   },