summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrés Manelli <andresmanelli@gmail.com>2018-04-15 23:26:46 -0300
committerAndrés Manelli <andresmanelli@gmail.com>2018-04-16 00:19:03 -0300
commit31584e849c2b1eeffc8be37a6da8902bb251ff52 (patch)
tree4ff762f89bd3ea2ffc834725824175ccf8292f03
parentb7358179012d1f34ff8204de2c7d91983550417d (diff)
downloadwekan-31584e849c2b1eeffc8be37a6da8902bb251ff52.tar.gz
wekan-31584e849c2b1eeffc8be37a6da8902bb251ff52.tar.bz2
wekan-31584e849c2b1eeffc8be37a6da8902bb251ff52.zip
Fix #1570, now zero means hide cards count
-rw-r--r--client/components/lists/listHeader.js3
-rw-r--r--client/components/users/userHeader.jade2
2 files changed, 3 insertions, 2 deletions
diff --git a/client/components/lists/listHeader.js b/client/components/lists/listHeader.js
index cf26aa93..4b6bf196 100644
--- a/client/components/lists/listHeader.js
+++ b/client/components/lists/listHeader.js
@@ -28,7 +28,8 @@ BlazeComponent.extendComponent({
},
showCardsCountForList(count) {
- return count > this.limitToShowCardsCount();
+ const limit = this.limitToShowCardsCount();
+ return limit > 0 && count > limit;
},
events() {
diff --git a/client/components/users/userHeader.jade b/client/components/users/userHeader.jade
index 096745ad..4ac59f45 100644
--- a/client/components/users/userHeader.jade
+++ b/client/components/users/userHeader.jade
@@ -86,5 +86,5 @@ template(name="changeSettingsPopup")
li
label.bold
| {{_ 'show-cards-minimum-count'}}
- input#show-cards-count-at.inline-input.left(type="number" value="#{showCardsCountAt}" min="1" max="99" onkeydown="return false")
+ input#show-cards-count-at.inline-input.left(type="number" value="#{showCardsCountAt}" min="0" max="99" onkeydown="return false")
input.js-apply-show-cards-at.left(type="submit" value="{{_ 'apply'}}")