Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-16 15:30:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Settings, "Show cards count" now shows also 1 card

Browse source
This commit is contained in:
Martin Filser 2021-02-06 15:44:18 +01:00
parent 40907ef1d8
commit 8475201db8
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/components/lists/listHeader.js
View file

@ -82,7 +82,7 @@ BlazeComponent.extendComponent({
showCardsCountForList(count) { showCardsCountForList(count) {
const limit = this.limitToShowCardsCount(); const limit = this.limitToShowCardsCount();
return limit > 0 && count > limit; return limit >= 0 && count > limit;
}, },
events() { events() {

2
client/components/users/userHeader.jade
View file

@ -143,7 +143,7 @@ template(name="changeSettingsPopup")
label.bold.clear label.bold.clear
i.fa.fa-sort-numeric-asc i.fa.fa-sort-numeric-asc
| {{_ 'show-cards-minimum-count'}} | {{_ 'show-cards-minimum-count'}}
input#show-cards-count-at.inline-input.left(type="number" value="#{showCardsCountAt}" min="0") input#show-cards-count-at.inline-input.left(type="number" value="#{showCardsCountAt}" min="-1")
label.bold.clear label.bold.clear
i.fa.fa-calendar i.fa.fa-calendar
| {{_ 'start-day-of-week'}} | {{_ 'start-day-of-week'}}

6
client/components/users/userHeader.js
View file

@ -274,7 +274,7 @@ Template.changeSettingsPopup.events({
'keypress/paste #show-cards-count-at'() { 'keypress/paste #show-cards-count-at'() {
let keyCode = event.keyCode; let keyCode = event.keyCode;
let charCode = String.fromCharCode(keyCode); let charCode = String.fromCharCode(keyCode);
let regex = new RegExp("[0-9]"); let regex = new RegExp("[-0-9]");
let ret = regex.test(charCode); let ret = regex.test(charCode);
return ret; return ret;
}, },
@ -309,8 +309,8 @@ Template.changeSettingsPopup.events({
10, 10,
); );
const currentUser = Meteor.user(); const currentUser = Meteor.user();
if (isNaN(minLimit)) { if (isNaN(minLimit) || minLimit < -1) {
minLimit = 0; minLimit = -1;
} }
if (!isNaN(minLimit)) { if (!isNaN(minLimit)) {
if (currentUser) { if (currentUser) {