diff options
| author | Lauri Ojansivu <x@xet7.org> | 2018-10-25 18:12:13 +0300 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2018-10-25 18:12:13 +0300 |
| commit | c72b3a870e9aa54a9509931cc88abfcab4564c8e (patch) | |
| tree | 01e5aa0e122d236dd63648ff828d7c4a0d35d2fb | |
| parent | 500ba88781320dec401c09bbac48a98f03db61d6 (diff) | |
| parent | 078bab405bcd38acfa9aad785e167ec37084bc8d (diff) | |
| download | wekan-c72b3a870e9aa54a9509931cc88abfcab4564c8e.tar.gz wekan-c72b3a870e9aa54a9509931cc88abfcab4564c8e.tar.bz2 wekan-c72b3a870e9aa54a9509931cc88abfcab4564c8e.zip | |
Merge branch 'bentiss-ui-fixes' into edge
| -rw-r--r-- | client/components/lists/listHeader.jade | 5 | ||||
| -rw-r--r-- | client/components/lists/listHeader.js | 10 |
2 files changed, 12 insertions, 3 deletions
diff --git a/client/components/lists/listHeader.jade b/client/components/lists/listHeader.jade index 61771449..25ab8c20 100644 --- a/client/components/lists/listHeader.jade +++ b/client/components/lists/listHeader.jade @@ -15,9 +15,8 @@ template(name="listHeader") |/#{wipLimit.value}) if showCardsCountForList cards.count - = cards.count - span - | {{_ 'cards-count'}} + | + p.quiet.small {{cardsCount}} {{_ 'cards-count'}} if isMiniScreen if currentList if isWatching diff --git a/client/components/lists/listHeader.js b/client/components/lists/listHeader.js index 4b6bf196..abcc4639 100644 --- a/client/components/lists/listHeader.js +++ b/client/components/lists/listHeader.js @@ -22,6 +22,16 @@ BlazeComponent.extendComponent({ return Meteor.user().getLimitToShowCardsCount(); }, + cardsCount() { + const list = Template.currentData(); + let swimlaneId = ''; + const boardView = Meteor.user().profile.boardView; + if (boardView === 'board-view-swimlanes') + swimlaneId = this.parentComponent().parentComponent().data()._id; + + return list.cards(swimlaneId).count(); + }, + reachedWipLimit() { const list = Template.currentData(); return list.getWipLimit('enabled') && list.getWipLimit('value') <= list.cards().count(); |