Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-16 23:40:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

implement getDefaultSwimline for boards

Browse source
This commit is contained in:
Nicu Tofan 2018-06-25 22:01:02 +03:00
parent aead18eb58
commit 04745f0c2f
No known key found for this signature in database
GPG key ID: 7EE66E95E64FD0B7
4 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/components/cards/subtasks.js
View file

@ -16,7 +16,7 @@ BlazeComponent.extendComponent({
const crtBoard = Boards.findOne(card.boardId); const crtBoard = Boards.findOne(card.boardId);
const targetBoard = crtBoard.getDefaultSubtasksBoard(); const targetBoard = crtBoard.getDefaultSubtasksBoard();
const listId = targetBoard.getDefaultSubtasksListId(); const listId = targetBoard.getDefaultSubtasksListId();
const swimlaneId = Swimlanes.findOne({boardId: targetBoard._id})._id; const swimlaneId = targetBoard.getDefaultSwimline()._id;
if (title) { if (title) {
const _id = Cards.insert({ const _id = Cards.insert({

2
client/components/lists/listBody.js
View file

@ -46,7 +46,7 @@ BlazeComponent.extendComponent({
if (boardView === 'board-view-swimlanes') if (boardView === 'board-view-swimlanes')
swimlaneId = this.parentComponent().parentComponent().data()._id; swimlaneId = this.parentComponent().parentComponent().data()._id;
else if (boardView === 'board-view-lists') else if (boardView === 'board-view-lists')
swimlaneId = Swimlanes.findOne({boardId})._id; swimlaneId = this.data().board().getDefaultSwimline()._id;
if (title) { if (title) {
const _id = Cards.insert({ const _id = Cards.insert({

12
models/boards.js
View file

@ -337,6 +337,18 @@ Boards.helpers({
getDefaultSubtasksList() { getDefaultSubtasksList() {
return Lists.findOne(this.getDefaultSubtasksListId()); return Lists.findOne(this.getDefaultSubtasksListId());
}, },
getDefaultSwimline() {
let result = Swimlanes.findOne({boardId: this._id});
if (result === undefined) {
Swimlanes.insert({
title: TAPi18n.__('default'),
boardId: this._id,
});
result = Swimlanes.findOne({boardId: this._id});
}
return result;
},
}); });

10
server/migrations.js
View file

@ -154,15 +154,7 @@ Migrations.add('add-sort-checklists', () => {
Migrations.add('add-swimlanes', () => { Migrations.add('add-swimlanes', () => {
Boards.find().forEach((board) => { Boards.find().forEach((board) => {
const swimlane = Swimlanes.findOne({ boardId: board._id }); const swimlaneId = board.getDefaultSwimline()._id;
let swimlaneId = '';
if (swimlane)
swimlaneId = swimlane._id;
else
swimlaneId = Swimlanes.direct.insert({
boardId: board._id,
title: 'Default',
});
Cards.find({ boardId: board._id }).forEach((card) => { Cards.find({ boardId: board._id }).forEach((card) => {
if (!card.hasOwnProperty('swimlaneId')) { if (!card.hasOwnProperty('swimlaneId')) {