1 files changed, 26 insertions, 0 deletions
diff --git a/client/components/activities/activities.js b/client/components/activities/activities.js
index b3fe8f50..0476897f 100644
--- a/client/components/activities/activities.js
+++ b/client/components/activities/activities.js
@@ -74,6 +74,8 @@ BlazeComponent.extendComponent({
 
   lastLabel(){
     const lastLabelId = this.currentData().labelId;
+    if (!lastLabelId)
+      return null;
     const lastLabel = Boards.findOne(Session.get('currentBoard')).getLabelById(lastLabelId);
     if(lastLabel.name === undefined || lastLabel.name === ''){
       return lastLabel.color;
@@ -82,6 +84,28 @@ BlazeComponent.extendComponent({
     }
   },
 
+  lastCustomField(){
+    const lastCustomField = CustomFields.findOne(this.currentData().customFieldId);
+    if (!lastCustomField)
+      return null;
+    return lastCustomField.name;
+  },
+
+  lastCustomFieldValue(){
+    const lastCustomField = CustomFields.findOne(this.currentData().customFieldId);
+    if (!lastCustomField)
+      return null;
+    const value = this.currentData().value;
+    if (lastCustomField.settings.dropdownItems && lastCustomField.settings.dropdownItems.length > 0) {
+      const dropDownValue = _.find(lastCustomField.settings.dropdownItems, (item) => {
+        return item._id === value;
+      });
+      if (dropDownValue)
+        return dropDownValue.name;
+    }
+    return value;
+  },
+
   listLabel() {
     return this.currentData().list().title;
   },
@@ -117,6 +141,8 @@ BlazeComponent.extendComponent({
 
   customField() {
     const customField = this.currentData().customField();
+    if (!customField)
+      return null;
     return customField.name;
   },