From d6259836e06b00f6e1e0e3c11802565b90ffddb7 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Fri, 1 Mar 2019 14:41:09 +0200 Subject: [PATCH 1/3] - [Add Filter fix back](https://github.com/wekan/wekan/issues/2213), because there was no bug in filter fix. Thanks to xet7 ! Closes #2213, related #2209 --- models/swimlanes.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/models/swimlanes.js b/models/swimlanes.js index 1b18ba5d8..9da4afb5f 100644 --- a/models/swimlanes.js +++ b/models/swimlanes.js @@ -133,14 +133,14 @@ Swimlanes.helpers({ }, lists() { - return Lists.find(Filter.mongoSelector({ + return Lists.find({ boardId: this.boardId, swimlaneId: {$in: [this._id, '']}, archived: false, - }), { sort: ['sort'] }); + }, { sort: ['sort'] }); }, - allLists() { + myLists() { return Lists.find({ swimlaneId: this._id }); }, @@ -189,7 +189,7 @@ Swimlanes.mutations({ archive() { if (this.isTemplateSwimlane()) { - this.lists().forEach((list) => { + this.myLists().forEach((list) => { return list.archive(); }); } @@ -198,7 +198,7 @@ Swimlanes.mutations({ restore() { if (this.isTemplateSwimlane()) { - this.allLists().forEach((list) => { + this.myLists().forEach((list) => { return list.restore(); }); } From 4ef3e587cb406fa66ff2300fc7746a43cff5d2af Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Fri, 1 Mar 2019 14:48:25 +0200 Subject: [PATCH 2/3] [Add Filter fix back](https://github.com/wekan/wekan/issues/2213), because there was no bug in filter fix. --- CHANGELOG.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f2ecc9d95..841c72a02 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,19 @@ +# Upcoming Wekan release + +This release fixes the following bugs: + +- [Add Filter fix back](https://github.com/wekan/wekan/issues/2213), + because there was no bug in filter fix. + +Thanks to GitHub user xet7 for contributions. + # v2.34 2019-03-01 Wekan release -This release tries to fix following bugs: +This release tried to fix following bugs, but did not fix anything: - Revert [Filter fix](https://github.com/wekan/wekan/issues/2213) because of [mongodb data tampered](https://github.com/wekan/wekan-snap/issues/83). + This was added back at Wekan v2.35. Thanks to GitHub user xet7 for contributions. From a4564bed3ada234fcaaa7d7dd469d58e05a652e1 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Fri, 1 Mar 2019 15:42:23 +0200 Subject: [PATCH 3/3] v2.35 --- 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 841c72a02..4e2346b27 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Upcoming Wekan release +# v2.35 2019-03-01 Wekan release This release fixes the following bugs: diff --git a/Stackerfile.yml b/Stackerfile.yml index 369e1aaf2..033321542 100644 --- a/Stackerfile.yml +++ b/Stackerfile.yml @@ -1,5 +1,5 @@ appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928 -appVersion: "v2.34.0" +appVersion: "v2.35.0" files: userUploads: - README.md diff --git a/package.json b/package.json index 572ca90d2..1ef680de7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v2.34.0", + "version": "v2.35.0", "description": "Open-Source kanban", "private": true, "scripts": { diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index 7c72f1a10..c8923eed9 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 = 236, + appVersion = 237, # Increment this for every release. - appMarketingVersion = (defaultText = "2.34.0~2019-03-01"), + appMarketingVersion = (defaultText = "2.35.0~2019-03-01"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0,