Merge remote-tracking branch 'upstream/master'

1 files changed, 6 insertions, 2 deletions

diff --git a/models/customFields.js b/models/customFields.js
index 1ca2fb90..a5eb8906 100644
--- a/models/customFields.js
+++ b/models/customFields.js
@@ -165,11 +165,15 @@ function customFieldDeletion(userId, doc) {
 // instead it shows undefined, and no listId and swimlaneId.
 function customFieldEdit(userId, doc) {
   const card = Cards.findOne(doc.cardId);
+  const customFieldValue = Activities.findOne({ customFieldId: doc._id }).value;
+  const boardId = card.boardId;
+  //boardId: doc.boardIds[0], // We are creating a customField, it has only one boardId
   Activities.insert({
     userId,
-    activityType: 'editCustomField',
-    boardId: doc.boardIds[0], // We are creating a customField, it has only one boardId
+    activityType: 'setCustomField',
+    boardId,
     customFieldId: doc._id,
+    customFieldValue,
     listId: card.listId,
     swimlaneId: card.swimlaneId,
   });