resolving merge conflicts

This commit is contained in:
IgnatzHome 2018-05-17 20:21:07 +02:00
commit 9518a5c11e
30 changed files with 880 additions and 58 deletions

View file

@ -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() {