From 163e4c8060a8a1a5035888d2531f7064a69a2112 Mon Sep 17 00:00:00 2001 From: Martin Filser Date: Tue, 5 Jan 2021 07:47:02 +0100 Subject: [PATCH 01/11] Cards, custom fields are displayed in alphabetic order - until now the order is undefined, it's different from card to card, it's the order in which the custom fields were added to the card. --- models/cards.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/models/cards.js b/models/cards.js index 8475db937..e2aa6a7e4 100644 --- a/models/cards.js +++ b/models/cards.js @@ -650,7 +650,7 @@ Cards.helpers({ // match right definition to each field if (!this.customFields) return []; - return this.customFields.map(customField => { + let ret = this.customFields.map(customField => { const definition = definitions.find(definition => { return definition._id === customField._id; }); @@ -676,6 +676,8 @@ Cards.helpers({ definition, }; }); + ret.sort((a, b) => a.definition.name.localeCompare(b.definition.name)); + return ret; }, colorClass() { From b1910d43003af7493b0a806c259e610e4af34769 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Tue, 5 Jan 2021 09:55:31 +0200 Subject: [PATCH 02/11] Update CHANGELOG.md --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 254212f0b..4d73705f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +# Upcoming Wekan release + +This release adds the following improvements: + +- [Update to My Cards](https://github.com/wekan/wekan/pulls/3416). + Thanks to jrsupplee. + +Thanks to above GitHub users for their contributions and translators for their translations. + # v4.70 2021-01-04 Wekan release This release adds the following CRITICAL SECURITY FIXES: From 94a3c1dc2194773055b87292ba89a752f0fa3c5b Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Tue, 5 Jan 2021 10:03:07 +0200 Subject: [PATCH 03/11] Update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d73705f9..2874136e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ This release adds the following improvements: - [Update to My Cards](https://github.com/wekan/wekan/pulls/3416). Thanks to jrsupplee. +- [Cards, custom fields are displayed in alphabetic order](https://github.com/wekan/wekan/pulls/3417). + Thanks to mfilser. Thanks to above GitHub users for their contributions and translators for their translations. From 26921a9c369220b552dc47365f35a156c44a56eb Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 6 Jan 2021 15:32:47 +0200 Subject: [PATCH 04/11] Try to fix Color picker of lists is empty. Thanks to bronger and xet7 ! Related #3418 --- packages/wekan-oidc/oidc_server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/wekan-oidc/oidc_server.js b/packages/wekan-oidc/oidc_server.js index a8271d157..1ef37f2fa 100644 --- a/packages/wekan-oidc/oidc_server.js +++ b/packages/wekan-oidc/oidc_server.js @@ -1,7 +1,7 @@ Oidc = {}; httpCa = false; -if (process.env.OAUTH2_CA_CERT !== undefined) { +if (process.env.OAUTH2_CA_CERT.length > 0) { try { const fs = Npm.require('fs'); httpCa = fs.readFileSync(process.env.OAUTH2_CA_CERT); From 6007fe263e2b712d4373a4ab4d95dea6512a6595 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 6 Jan 2021 15:43:46 +0200 Subject: [PATCH 05/11] Try to fix Color picker of lists is empty. Part 2. Thanks to bronger and xet7 ! Related #3418 --- packages/wekan-oidc/oidc_server.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/wekan-oidc/oidc_server.js b/packages/wekan-oidc/oidc_server.js index 1ef37f2fa..2d8dc46ff 100644 --- a/packages/wekan-oidc/oidc_server.js +++ b/packages/wekan-oidc/oidc_server.js @@ -1,10 +1,12 @@ Oidc = {}; httpCa = false; -if (process.env.OAUTH2_CA_CERT.length > 0) { +if (process.env.OAUTH2_CA_CERT !== undefined) { try { const fs = Npm.require('fs'); - httpCa = fs.readFileSync(process.env.OAUTH2_CA_CERT); + if (fs.existsSync(process.env.OAUTH2_CA_CERT) { + httpCa = fs.readFileSync(process.env.OAUTH2_CA_CERT); + } } catch(e) { console.log('WARNING: failed loading: ' + process.env.OAUTH2_CA_CERT); console.log(e); From 5f647fd2ab86a3a3dd1c98e960eb02bcac367560 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 6 Jan 2021 15:47:21 +0200 Subject: [PATCH 06/11] Try to fix Color picker of lists is empty. Part 3. Thanks to bronger and xet7 ! Related #3418 --- packages/wekan-oidc/oidc_server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/wekan-oidc/oidc_server.js b/packages/wekan-oidc/oidc_server.js index 2d8dc46ff..97f20519b 100644 --- a/packages/wekan-oidc/oidc_server.js +++ b/packages/wekan-oidc/oidc_server.js @@ -4,7 +4,7 @@ httpCa = false; if (process.env.OAUTH2_CA_CERT !== undefined) { try { const fs = Npm.require('fs'); - if (fs.existsSync(process.env.OAUTH2_CA_CERT) { + if (fs.existsSync(process.env.OAUTH2_CA_CERT)) { httpCa = fs.readFileSync(process.env.OAUTH2_CA_CERT); } } catch(e) { From f7e85ac86cf486124f1d61815a9a34111b1bb8ed Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 6 Jan 2021 16:48:39 +0200 Subject: [PATCH 07/11] Docker builds at Docker Hub seem to work OK. --- README.md | 8 ++------ docker-compose.yml | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 36b4fc279..2a32560c9 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,8 @@ [![Contributors](https://img.shields.io/github/contributors/wekan/wekan.svg "Contributors")](https://github.com/wekan/wekan/graphs/contributors) [![Docker Repository on Quay](https://quay.io/repository/wekan/wekan/status "Docker Repository on Quay")](https://quay.io/repository/wekan/wekan) +[![Docker Hub container status](https://img.shields.io/docker/build/wekanteam/wekan.svg "Docker Hub container sta> +[![Docker Hub pulls](https://img.shields.io/docker/pulls/wekanteam/wekan.svg "Docker Hub Pulls")](https://hub.doc> [![Wekan Build Status][travis_badge]][travis_status] [![Codacy Badge](https://api.codacy.com/project/badge/Grade/02137ecec4e34c5aa303f57637196a93 "Codacy Badge")](https://www.codacy.com/app/xet7/wekan?utm_source=github.com&utm_medium=referral&utm_content=wekan/wekan&utm_campaign=Badge_Grade) [![Code Climate](https://codeclimate.com/github/wekan/wekan/badges/gpa.svg "Code Climate")](https://codeclimate.com/github/wekan/wekan) @@ -11,12 +13,6 @@ [![Code analysis at Open Hub](https://img.shields.io/badge/code%20analysis-at%20Open%20Hub-brightgreen.svg "Code analysis at Open Hub")](https://www.openhub.net/p/wekan) [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fwekan%2Fwekan.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fwekan%2Fwekan?ref=badge_shield) -NOTE: Docker Hub builds are broken with error ENOMEM. Only Quay works, see docker-compose.yml . - - ## [Translate Wekan at Transifex](https://transifex.com/wekan/wekan) Translations to non-English languages are accepted only at [Transifex](https://transifex.com/wekan/wekan) using webbrowser. diff --git a/docker-compose.yml b/docker-compose.yml index 09960468d..7853d5c3b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -118,7 +118,7 @@ services: image: quay.io/wekan/wekan # b) Using specific version tag: # image: quay.io/wekan/wekan:v4.52 - # c) Docker Hub builds are broken with error ENOMEM https://hub.docker.com/r/wekanteam/wekan + # c) Docker Hub builds work https://hub.docker.com/r/wekanteam/wekan # image: wekanteam/wekan #------------------------------------------------------------------------------------- container_name: wekan-app From c7f260d0301a3c95afb727b9b9aef99872ba5b90 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 6 Jan 2021 16:49:20 +0200 Subject: [PATCH 08/11] Fix lint errors. --- models/cards.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/cards.js b/models/cards.js index e2aa6a7e4..d8d1513dd 100644 --- a/models/cards.js +++ b/models/cards.js @@ -650,7 +650,7 @@ Cards.helpers({ // match right definition to each field if (!this.customFields) return []; - let ret = this.customFields.map(customField => { + const ret = this.customFields.map(customField => { const definition = definitions.find(definition => { return definition._id === customField._id; }); From 2e6064ce5ca3d79cc23a935284814d8e6b725512 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 6 Jan 2021 16:55:17 +0200 Subject: [PATCH 09/11] Try to fix Color picker of lists is empty. Part 4. Thanks to bronger and xet7 ! Related #3418 --- client/components/lists/listHeader.jade | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/client/components/lists/listHeader.jade b/client/components/lists/listHeader.jade index 0660e1b2d..7f5da578e 100644 --- a/client/components/lists/listHeader.jade +++ b/client/components/lists/listHeader.jade @@ -152,9 +152,9 @@ template(name="wipLimitErrorPopup") template(name="setListColorPopup") form.edit-label .palette-colors: each colors - // note: we use the swimlane palette to have more than just the border - span.card-label.palette-color.js-palette-color(class=colorClass) - if(isSelected color) - i.fa.fa-check + unless $eq color 'white' + span.card-label.palette-color.js-palette-color(card-details-{{color}}) + if(isSelected color) + i.fa.fa-check button.primary.confirm.js-submit {{_ 'save'}} button.js-remove-color.negate.wide.right {{_ 'unset-color'}} From ff8d899266507a77616a6622c4731bae54c846b5 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 6 Jan 2021 20:08:12 +0200 Subject: [PATCH 10/11] Try to fix Color picker of lists is empty. Part 5, reverting part 4. Thanks to bronger and xet7 ! Related #3418 --- client/components/lists/listHeader.jade | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/client/components/lists/listHeader.jade b/client/components/lists/listHeader.jade index 7f5da578e..0660e1b2d 100644 --- a/client/components/lists/listHeader.jade +++ b/client/components/lists/listHeader.jade @@ -152,9 +152,9 @@ template(name="wipLimitErrorPopup") template(name="setListColorPopup") form.edit-label .palette-colors: each colors - unless $eq color 'white' - span.card-label.palette-color.js-palette-color(card-details-{{color}}) - if(isSelected color) - i.fa.fa-check + // note: we use the swimlane palette to have more than just the border + span.card-label.palette-color.js-palette-color(class=colorClass) + if(isSelected color) + i.fa.fa-check button.primary.confirm.js-submit {{_ 'save'}} button.js-remove-color.negate.wide.right {{_ 'unset-color'}} From 4649553c5e84c8f81b3b9b1c371e1e79f397a57a Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 6 Jan 2021 22:15:06 +0200 Subject: [PATCH 11/11] Try to fix Color picker of lists is empty. Part 6. Thanks to bronger and xet7 ! Related #3418 --- client/components/lists/listHeader.jade | 2 +- client/components/lists/listHeader.js | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/client/components/lists/listHeader.jade b/client/components/lists/listHeader.jade index 0660e1b2d..c566003f3 100644 --- a/client/components/lists/listHeader.jade +++ b/client/components/lists/listHeader.jade @@ -153,7 +153,7 @@ template(name="setListColorPopup") form.edit-label .palette-colors: each colors // note: we use the swimlane palette to have more than just the border - span.card-label.palette-color.js-palette-color(class=colorClass) + span.card-label.palette-color.js-palette-color(class="card-details-{{color}}") if(isSelected color) i.fa.fa-check button.primary.confirm.js-submit {{_ 'save'}} diff --git a/client/components/lists/listHeader.js b/client/components/lists/listHeader.js index 9545f6609..f4a4e7c0b 100644 --- a/client/components/lists/listHeader.js +++ b/client/components/lists/listHeader.js @@ -279,7 +279,11 @@ BlazeComponent.extendComponent({ }, isSelected(color) { - return this.currentColor.get() === color; + if (this.currentColor.get() === null) { + return color === 'white'; + } else { + return this.currentColor.get() === color; + } }, events() {