diff options
author | Lauri Ojansivu <x@xet7.org> | 2019-03-20 19:30:44 +0200 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2019-03-20 19:30:44 +0200 |
commit | dce89bcfa84106ecb18ba65247d13003f9aac660 (patch) | |
tree | f4ccebb1fbd74981e00ca759c177ee57a5c9ee0e /client/components/activities/activities.js | |
parent | e5370ce859a0d18f2d4a94216e9baf808062c617 (diff) | |
parent | 777d9ac35320cbfdd8d90136b176d4a3e69e74be (diff) | |
download | wekan-dce89bcfa84106ecb18ba65247d13003f9aac660.tar.gz wekan-dce89bcfa84106ecb18ba65247d13003f9aac660.tar.bz2 wekan-dce89bcfa84106ecb18ba65247d13003f9aac660.zip |
Merge branch 'edge' of https://github.com/andresmanelli/wekan into andresmanelli-edge
Diffstat (limited to 'client/components/activities/activities.js')
-rw-r--r-- | client/components/activities/activities.js | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/client/components/activities/activities.js b/client/components/activities/activities.js index 81995221..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; @@ -84,11 +86,15 @@ 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) => { @@ -135,6 +141,8 @@ BlazeComponent.extendComponent({ customField() { const customField = this.currentData().customField(); + if (!customField) + return null; return customField.name; }, |