Merge branch 'edge' into meteor-1.8

CHANGELOG.md

@@ -1,9 +1,19 @@
+# v2.35 2019-03-01 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.
 

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

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();
       });
     }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v2.34.0",
+  "version": "v2.35.0",
   "description": "Open-Source kanban",
   "private": true,
   "scripts": {

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,