mirror of
https://github.com/wekan/wekan.git
synced 2025-12-31 14:48:48 +01:00
resolving merge conflicts
This commit is contained in:
commit
9518a5c11e
30 changed files with 880 additions and 58 deletions
|
|
@ -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() {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue