diff options
author | Lauri Ojansivu <x@xet7.org> | 2019-06-27 05:04:23 +0300 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2019-06-27 05:04:23 +0300 |
commit | fb728baf0c87bae5fa39d92089b667ff1ed69fa6 (patch) | |
tree | ddc4a0732aff7c6ebe308dbd1095196beba0acca /models/customFields.js | |
parent | 0c352ab14385a886e06b03917b4443a18c8a12a1 (diff) | |
parent | 436db99a5bdbab1215c425fab4d298b2783948c8 (diff) | |
download | wekan-fb728baf0c87bae5fa39d92089b667ff1ed69fa6.tar.gz wekan-fb728baf0c87bae5fa39d92089b667ff1ed69fa6.tar.bz2 wekan-fb728baf0c87bae5fa39d92089b667ff1ed69fa6.zip |
Merge branch 'edge' into meteor-1.8
Diffstat (limited to 'models/customFields.js')
-rw-r--r-- | models/customFields.js | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/models/customFields.js b/models/customFields.js index a67ddb7d..83033cb4 100644 --- a/models/customFields.js +++ b/models/customFields.js @@ -117,6 +117,29 @@ function customFieldCreation(userId, doc){ }); } +function customFieldDeletion(userId, doc){ + Activities.insert({ + userId, + activityType: 'deleteCustomField', + boardId: doc.boardIds[0], // We are creating a customField, it has only one boardId + customFieldId: doc._id, + }); +} + +// This has some bug, it does not show edited customField value at Outgoing Webhook, +// instead it shows undefined, and no listId and swimlaneId. +function customFieldEdit(userId, doc){ + const card = Cards.findOne(doc.cardId); + Activities.insert({ + userId, + activityType: 'editCustomField', + boardId: doc.boardIds[0], // We are creating a customField, it has only one boardId + customFieldId: doc._id, + listId: card.listId, + swimlaneId: card.swimlaneId, + }); +} + if (Meteor.isServer) { Meteor.startup(() => { CustomFields._collection._ensureIndex({ boardIds: 1 }); @@ -133,9 +156,12 @@ if (Meteor.isServer) { {$pull: {'customFields': {'_id': doc._id}}}, {multi: true} ); + customFieldEdit(userId, doc); Activities.remove({ customFieldId: doc._id, boardId: modifier.$pull.boardIds, + listId: card.listId, + swimlaneId: card.swimlaneId, }); } else if (_.contains(fieldNames, 'boardIds') && modifier.$push) { Activities.insert({ @@ -148,6 +174,7 @@ if (Meteor.isServer) { }); CustomFields.before.remove((userId, doc) => { + customFieldDeletion(userId, doc); Activities.remove({ customFieldId: doc._id, }); |