diff options
| author | Lauri Ojansivu <x@xet7.org> | 2019-10-30 20:33:53 +0200 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2019-10-30 20:33:53 +0200 |
| commit | acc6bc07589038fb8369865915f529453103f47d (patch) | |
| tree | 4168284d02ae4304e427a9b78b5c8e639d6283dc /client | |
| parent | f3bc92904c2c054ba832a536599759f02a226f6b (diff) | |
| parent | 3308d90a3a6a1ddeed33966767937cd2c2c90cb5 (diff) | |
| download | wekan-acc6bc07589038fb8369865915f529453103f47d.tar.gz wekan-acc6bc07589038fb8369865915f529453103f47d.tar.bz2 wekan-acc6bc07589038fb8369865915f529453103f47d.zip | |
Merge branch 'master' of https://github.com/whowillcare/wekan into whowillcare-master
Diffstat (limited to 'client')
| -rw-r--r-- | client/components/swimlanes/swimlanes.jade | 16 | ||||
| -rw-r--r-- | client/lib/filter.js | 4 |
2 files changed, 11 insertions, 9 deletions
diff --git a/client/components/swimlanes/swimlanes.jade b/client/components/swimlanes/swimlanes.jade index 9eab6054..98af6d54 100644 --- a/client/components/swimlanes/swimlanes.jade +++ b/client/components/swimlanes/swimlanes.jade @@ -12,13 +12,13 @@ template(name="swimlane") unless currentUser.isCommentOnly +addListForm else + if currentUser.isBoardMember + unless currentUser.isCommentOnly + +addListForm each lists +list(this) if currentCardIsInThisList _id ../_id +cardDetails(currentCard) - if currentUser.isBoardMember - unless currentUser.isCommentOnly - +addListForm template(name="listsGroup") .swimlane.list-group.js-lists @@ -26,20 +26,20 @@ template(name="listsGroup") if currentList +list(currentList) else - each lists - +miniList(this) if currentUser.isBoardMember unless currentUser.isCommentOnly +addListForm + each lists + +miniList(this) else + if currentUser.isBoardMember + unless currentUser.isCommentOnly + +addListForm each lists if visible this +list(this) if currentCardIsInThisList _id null +cardDetails(currentCard) - if currentUser.isBoardMember - unless currentUser.isCommentOnly - +addListForm template(name="addListForm") .list.list-composer.js-list-composer(class="{{#if isMiniScreen}}mini-list{{/if}}") diff --git a/client/lib/filter.js b/client/lib/filter.js index 9ddea65c..592eb4ab 100644 --- a/client/lib/filter.js +++ b/client/lib/filter.js @@ -477,7 +477,9 @@ Filter = { return ( _.any(this._fields, fieldName => { return this[fieldName]._isActive(); - }) || this.advanced._isActive() + }) || + this.advanced._isActive() || + this.lists._isActive() ); }, |