summaryrefslogtreecommitdiffstats
path: root/client/components/lists
diff options
context:
space:
mode:
authorIgnatzHome <ignatz@maschath.de>2018-05-17 20:21:07 +0200
committerIgnatzHome <ignatz@maschath.de>2018-05-17 20:21:07 +0200
commit9518a5c11ee5bc8556ad7af2d0bef1aa8ae47874 (patch)
tree47ffe9a487aa6d66bbb4cd327ca248c4b30fda4a /client/components/lists
parentc0c7b269a794fb28ddf5ffc17744f6724041de96 (diff)
parent8b16955cc27b29ae507be084adccc4fad61b05ef (diff)
downloadwekan-9518a5c11ee5bc8556ad7af2d0bef1aa8ae47874.tar.gz
wekan-9518a5c11ee5bc8556ad7af2d0bef1aa8ae47874.tar.bz2
wekan-9518a5c11ee5bc8556ad7af2d0bef1aa8ae47874.zip
resolving merge conflicts
Diffstat (limited to 'client/components/lists')
-rw-r--r--client/components/lists/listBody.js7
1 files changed, 7 insertions, 0 deletions
diff --git a/client/components/lists/listBody.js b/client/components/lists/listBody.js
index 52f34fab..24e5cf5d 100644
--- a/client/components/lists/listBody.js
+++ b/client/components/lists/listBody.js
@@ -35,6 +35,10 @@ BlazeComponent.extendComponent({
const members = formComponent.members.get();
const labelIds = formComponent.labels.get();
+ const customFields = formComponent.customFields.get();
+ console.log("members", members);
+ console.log("labelIds", labelIds);
+ console.log("customFields", customFields);
const boardId = this.data().board()._id;
let swimlaneId = '';
@@ -49,6 +53,7 @@ BlazeComponent.extendComponent({
title,
members,
labelIds,
+ customFields,
listId: this.data()._id,
boardId: this.data().board()._id,
sort: sortIndex,
@@ -146,11 +151,13 @@ BlazeComponent.extendComponent({
onCreated() {
this.labels = new ReactiveVar([]);
this.members = new ReactiveVar([]);
+ this.customFields = new ReactiveVar([]);
},
reset() {
this.labels.set([]);
this.members.set([]);
+ this.customFields.set([]);
},
getLabels() {