From 0e2b7458d7ac98e312c1a231b9dfe7d0965ea986 Mon Sep 17 00:00:00 2001 From: Justin Reynolds Date: Tue, 12 Mar 2019 12:04:59 -0500 Subject: [PATCH 1/6] Fix watchers undefined #2252 --- models/activities.js | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/models/activities.js b/models/activities.js index 84c458566..1e97895de 100644 --- a/models/activities.js +++ b/models/activities.js @@ -113,9 +113,11 @@ if (Meteor.isServer) { } if (activity.oldBoardId) { const oldBoard = activity.oldBoard(); - watchers = _.union(watchers, oldBoard.watchers || []); - params.oldBoard = oldBoard.title; - params.oldBoardId = activity.oldBoardId; + if (oldBoard) { + watchers = _.union(watchers, oldBoard.watchers || []); + params.oldBoard = oldBoard.title; + params.oldBoardId = activity.oldBoardId; + } } if (activity.memberId) { participants = _.union(participants, [activity.memberId]); @@ -129,15 +131,19 @@ if (Meteor.isServer) { } if (activity.oldListId) { const oldList = activity.oldList(); - watchers = _.union(watchers, oldList.watchers || []); - params.oldList = oldList.title; - params.oldListId = activity.oldListId; + if (oldList) { + watchers = _.union(watchers, oldList.watchers || []); + params.oldList = oldList.title; + params.oldListId = activity.oldListId; + } } if (activity.oldSwimlaneId) { const oldSwimlane = activity.oldSwimlane(); - watchers = _.union(watchers, oldSwimlane.watchers || []); - params.oldSwimlane = oldSwimlane.title; - params.oldSwimlaneId = activity.oldSwimlaneId; + if (oldSwimlane) { + watchers = _.union(watchers, oldSwimlane.watchers || []); + params.oldSwimlane = oldSwimlane.title; + params.oldSwimlaneId = activity.oldSwimlaneId; + } } if (activity.cardId) { const card = activity.card(); From aca304803628ddf88df802edefd7f996edcb4d40 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Tue, 12 Mar 2019 23:01:18 +0200 Subject: [PATCH 2/6] Update changelog. --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d95edd59a..b3bd446d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +# Upcoming Wekan release + +This release fixes the following bugs: + +- [Fix watchers undefined](https://github.com/wekan/wekan/pull/2253). + Thanks to justinr1234. + +Thanks to above GitHub users and translators for their translations. + # v2.45 2019-03-11 Wekan release This release fixes the following bugs, thanks to andresmanelli: From 95a40a45e5370e88f848a7090b83ad149b95fa00 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 13 Mar 2019 00:30:07 +0200 Subject: [PATCH 3/6] Update translations. --- i18n/fr.i18n.json | 4 ++-- i18n/ru.i18n.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/i18n/fr.i18n.json b/i18n/fr.i18n.json index 73a89c013..848941d37 100644 --- a/i18n/fr.i18n.json +++ b/i18n/fr.i18n.json @@ -567,8 +567,8 @@ "activity-added-label-card": "a ajouté l'étiquette '%s'", "activity-removed-label-card": "a supprimé l'étiquette '%s'", "activity-delete-attach-card": "a supprimé une pièce jointe", - "activity-set-customfield": "set custom field '%s' to '%s' in %s", - "activity-unset-customfield": "unset custom field '%s' in %s", + "activity-set-customfield": "a défini le champ personnalisé '%s' à '%s' dans %s", + "activity-unset-customfield": "a effacé le champ personnalisé '%s' dans %s", "r-rule": "Règle", "r-add-trigger": "Ajouter un déclencheur", "r-add-action": "Ajouter une action", diff --git a/i18n/ru.i18n.json b/i18n/ru.i18n.json index 91aa5c7c8..d5169aef3 100644 --- a/i18n/ru.i18n.json +++ b/i18n/ru.i18n.json @@ -567,8 +567,8 @@ "activity-added-label-card": "добавил метку '%s'", "activity-removed-label-card": "удалил метку '%s'", "activity-delete-attach-card": "удалил вложение", - "activity-set-customfield": "set custom field '%s' to '%s' in %s", - "activity-unset-customfield": "unset custom field '%s' in %s", + "activity-set-customfield": "сменил значение поля '%s' на '%s' в карточке %s", + "activity-unset-customfield": "очистил поле '%s' в карточке %s", "r-rule": "Правило", "r-add-trigger": "Задать условие", "r-add-action": "Задать действие", From 1968b7da31d75757fd6383417d729ff6af6bbc5b Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 13 Mar 2019 15:35:34 +0200 Subject: [PATCH 4/6] Revert hiding of Subtask boards, because of feedback from Wekan users, that need Subtask boards to be visible. Thanks to xet7 ! --- client/components/boards/boardsList.js | 1 - 1 file changed, 1 deletion(-) diff --git a/client/components/boards/boardsList.js b/client/components/boards/boardsList.js index 3a49a8bfd..ad5ee5516 100644 --- a/client/components/boards/boardsList.js +++ b/client/components/boards/boardsList.js @@ -25,7 +25,6 @@ BlazeComponent.extendComponent({ archived: false, 'members.userId': Meteor.userId(), type: 'board', - subtasksDefaultListId: null, }, { sort: [['stars', 'desc'], ['color', 'asc'], ['title', 'asc'], ['description', 'asc'], ['_id', 'asc']] }); }, isStarred() { From d16086fcdb9768989dc0a8b84163ef259c03bac3 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 13 Mar 2019 15:40:20 +0200 Subject: [PATCH 5/6] Update changelog. --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b3bd446d2..57571ea22 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ This release fixes the following bugs: - [Fix watchers undefined](https://github.com/wekan/wekan/pull/2253). Thanks to justinr1234. +- [Revert hiding of Subtask boards](https://github.com/wekan/wekan/commit/1968b7da31d75757fd6383417d729ff6af6bbc5b) + because of feedback from Wekan users, that need Subtask boards to be visible. + Thanks to xet7. Thanks to above GitHub users and translators for their translations. @@ -45,7 +48,7 @@ Thanks to above Wekan contributors for their contributions. This release adds the following new features, thanks to xet7: -- [Hide Subtask boards from All Boards](https://github.com/wekan/wekan/issues/1990). +- [Hide Subtask boards from All Boards](https://github.com/wekan/wekan/issues/1990). This was reverted in Wekan v2.46 to make Subtask boards visible again. - [Order All Boards by Starred, Color, Title and Description](https://github.com/wekan/wekan/commit/856872815292590e0c4eff2848ea1b857a318dc4). - [HTTP header automatic login](https://github.com/wekan/wekan/commit/ff825d6123ecfd033ccb08ce97c11cefee676104) for [3rd party authentication server method](https://github.com/wekan/wekan/issues/2019) like siteminder, and any webserver that From 299484f7b28b7bca134618a8c95102626c935b6d Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 13 Mar 2019 15:55:52 +0200 Subject: [PATCH 6/6] v2.46 --- CHANGELOG.md | 2 +- Stackerfile.yml | 2 +- package.json | 2 +- sandstorm-pkgdef.capnp | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 57571ea22..a17c8d1d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Upcoming Wekan release +# v2.46 2019-03-13 Wekan release This release fixes the following bugs: diff --git a/Stackerfile.yml b/Stackerfile.yml index 39885d8d1..3b0fdd602 100644 --- a/Stackerfile.yml +++ b/Stackerfile.yml @@ -1,5 +1,5 @@ appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928 -appVersion: "v2.45.0" +appVersion: "v2.46.0" files: userUploads: - README.md diff --git a/package.json b/package.json index fab14904b..e5bbd1ac7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v2.45.0", + "version": "v2.46.0", "description": "Open-Source kanban", "private": true, "scripts": { diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index ef66ffd4d..d0f43f917 100644 --- a/sandstorm-pkgdef.capnp +++ b/sandstorm-pkgdef.capnp @@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = ( appTitle = (defaultText = "Wekan"), # The name of the app as it is displayed to the user. - appVersion = 247, + appVersion = 248, # Increment this for every release. - appMarketingVersion = (defaultText = "2.45.0~2019-03-11"), + appMarketingVersion = (defaultText = "2.46.0~2019-03-13"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0,