diff options
Diffstat (limited to 'client/components')
-rw-r--r-- | client/components/lists/listBody.js | 4 | ||||
-rw-r--r-- | client/components/swimlanes/swimlanes.jade | 19 | ||||
-rw-r--r-- | client/components/swimlanes/swimlanes.js | 9 |
3 files changed, 17 insertions, 15 deletions
diff --git a/client/components/lists/listBody.js b/client/components/lists/listBody.js index befcf72f..7b3dc6a6 100644 --- a/client/components/lists/listBody.js +++ b/client/components/lists/listBody.js @@ -630,8 +630,8 @@ BlazeComponent.extendComponent({ } else if (this.isListTemplateSearch) { element.sort = Swimlanes.findOne(this.swimlaneId).lists().count(); element.type = 'list'; - element.swimlaneId = this.swimlaneId; - _id = element.copy(); + element.swimlaneId = ''; + _id = element.copy(this.swimlaneId); } else if (this.isSwimlaneTemplateSearch) { element.sort = Boards.findOne(this.boardId).swimlanes().count(); element.type = 'swimlalne'; diff --git a/client/components/swimlanes/swimlanes.jade b/client/components/swimlanes/swimlanes.jade index ba174cb5..c56834df 100644 --- a/client/components/swimlanes/swimlanes.jade +++ b/client/components/swimlanes/swimlanes.jade @@ -3,22 +3,15 @@ template(name="swimlane") +swimlaneHeader .swimlane.js-lists.js-swimlane if isMiniScreen - if currentList + if currentListIsInThisSwimlane _id +list(currentList) - else - each currentBoard.lists + unless currentList + each lists +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 + each lists +list(this) if currentCardIsInThisList _id ../_id +cardDetails(currentCard) @@ -31,12 +24,12 @@ template(name="listsGroup") if currentList +list(currentList) else - each currentBoard.lists + each lists +miniList(this) if currentUser.isBoardMember +addListForm else - each currentBoard.lists + each lists +list(this) if currentCardIsInThisList _id null +cardDetails(currentCard) diff --git a/client/components/swimlanes/swimlanes.js b/client/components/swimlanes/swimlanes.js index b4277d4f..519b00d2 100644 --- a/client/components/swimlanes/swimlanes.js +++ b/client/components/swimlanes/swimlanes.js @@ -1,5 +1,10 @@ const { calculateIndex, enableClickOnTouch } = Utils; +function currentListIsInThisSwimlane(swimlaneId) { + const currentList = Lists.findOne(Session.get('currentList')); + return currentList && (currentList.swimlaneId === swimlaneId || currentList.swimlaneId === ''); +} + function currentCardIsInThisList(listId, swimlaneId) { const currentCard = Cards.findOne(Session.get('currentCard')); const currentUser = Meteor.user(); @@ -114,6 +119,10 @@ BlazeComponent.extendComponent({ return currentCardIsInThisList(listId, swimlaneId); }, + currentListIsInThisSwimlane(swimlaneId) { + return currentListIsInThisSwimlane(swimlaneId); + }, + events() { return [{ // Click-and-drag action |