diff options
author | Andrés Manelli <andresmanelli@gmail.com> | 2019-02-23 01:40:11 +0100 |
---|---|---|
committer | Andrés Manelli <andresmanelli@gmail.com> | 2019-02-24 00:05:00 +0100 |
commit | cdf070189e11205eecd11641226ae62964cc03e1 (patch) | |
tree | a5f0d59fa0a7cb117f3a6b63c2fe8b229b055f7b /client/components/swimlanes | |
parent | 64bf455b296a10369e8318183c2c6cd61a122869 (diff) | |
download | wekan-cdf070189e11205eecd11641226ae62964cc03e1.tar.gz wekan-cdf070189e11205eecd11641226ae62964cc03e1.tar.bz2 wekan-cdf070189e11205eecd11641226ae62964cc03e1.zip |
Remove links from templates board for the moment
Insert the correct template type in templates board
Allow independant lists in templates board
Add some helpers
Diffstat (limited to 'client/components/swimlanes')
-rw-r--r-- | client/components/swimlanes/swimlaneHeader.js | 2 | ||||
-rw-r--r-- | client/components/swimlanes/swimlanes.jade | 7 | ||||
-rw-r--r-- | client/components/swimlanes/swimlanes.js | 7 |
3 files changed, 16 insertions, 0 deletions
diff --git a/client/components/swimlanes/swimlaneHeader.js b/client/components/swimlanes/swimlaneHeader.js index 1004cb25..b78bdc96 100644 --- a/client/components/swimlanes/swimlaneHeader.js +++ b/client/components/swimlanes/swimlaneHeader.js @@ -47,12 +47,14 @@ BlazeComponent.extendComponent({ const titleInput = this.find('.swimlane-name-input'); const title = titleInput.value.trim(); const sortValue = calculateIndexData(this.currentSwimlane, nextSwimlane, 1); + const swimlaneType = (currentBoard.isTemplatesBoard())?'template-swimlane':'swimlane'; if (title) { Swimlanes.insert({ title, boardId: Session.get('currentBoard'), sort: sortValue.base, + type: swimlaneType, }); titleInput.value = ''; diff --git a/client/components/swimlanes/swimlanes.jade b/client/components/swimlanes/swimlanes.jade index 34177a02..0e070a21 100644 --- a/client/components/swimlanes/swimlanes.jade +++ b/client/components/swimlanes/swimlanes.jade @@ -10,6 +10,13 @@ template(name="swimlane") +miniList(this) if currentUser.isBoardMember +addListForm + else if currentBoard.isTemplatesBoard + each lists + +list(this) + if currentCardIsInThisList _id ../_id + +cardDetails(currentCard) + if currentUser.isBoardMember + +addListForm else each currentBoard.lists +list(this) diff --git a/client/components/swimlanes/swimlanes.js b/client/components/swimlanes/swimlanes.js index ce327f54..4dd84604 100644 --- a/client/components/swimlanes/swimlanes.js +++ b/client/components/swimlanes/swimlanes.js @@ -153,6 +153,10 @@ BlazeComponent.extendComponent({ }).register('swimlane'); BlazeComponent.extendComponent({ + onCreated() { + this.currentSwimlane = this.currentData(); + }, + // Proxy open() { this.childComponents('inlinedForm')[0].open(); @@ -164,11 +168,14 @@ BlazeComponent.extendComponent({ evt.preventDefault(); const titleInput = this.find('.list-name-input'); const title = titleInput.value.trim(); + const listType = (this.currentSwimlane.isListTemplatesSwimlane())?'template-list':'list'; if (title) { Lists.insert({ title, boardId: Session.get('currentBoard'), sort: $('.list').length, + type: listType, + swimlaneId: this.currentSwimlane._id, }); titleInput.value = ''; |