summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2017-09-02 16:30:43 +0300
committerLauri Ojansivu <x@xet7.org>2017-09-02 16:30:43 +0300
commita3d4a9489086869a80d095a91ff3860a16861d14 (patch)
treea2039cfeb8afe13995f07b555a7a953c690720b9 /client
parentd4537af3b4a3072196309ddaa0679dc935f3c46c (diff)
parenteb9b8091754867a537d68f3837efbc9705532413 (diff)
downloadwekan-a3d4a9489086869a80d095a91ff3860a16861d14.tar.gz
wekan-a3d4a9489086869a80d095a91ff3860a16861d14.tar.bz2
wekan-a3d4a9489086869a80d095a91ff3860a16861d14.zip
Merge branch 'GhassenRjab-feature/manual-attachments-activities' into devel
Import attachments related activities from Wekan and Trello. Thanks to GhassenRjab ! Closes #1157
Diffstat (limited to 'client')
-rw-r--r--client/components/cards/attachments.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/client/components/cards/attachments.js b/client/components/cards/attachments.js
index 4e3e0b19..95cb9f55 100644
--- a/client/components/cards/attachments.js
+++ b/client/components/cards/attachments.js
@@ -62,7 +62,7 @@ Template.cardAttachmentsPopup.events({
const file = new FS.File(f);
file.boardId = card.boardId;
file.cardId = card._id;
-
+ file.userId = Meteor.userId();
Attachments.insert(file);
Popup.close();
});
@@ -109,6 +109,7 @@ Template.previewClipboardImagePopup.events({
file.updatedAt(new Date());
file.boardId = card.boardId;
file.cardId = card._id;
+ file.userId = Meteor.userId();
Attachments.insert(file);
pastedResults = null;
$(document.body).pasteImageReader(() => {});