Merge branch 'edge' into meteor-1.8

5 files changed, 25 insertions, 5 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 25691b9e..99f90dcd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
+# v2.41 2019-03-07 Wekan release
+
+This release fixes the following bugs:
+
+- [Fix: Card was selected as parent card (circular reference) and now board can be not opened anymore](https://github.com/wekan/wekan/issues/2202)
+  with [Avoid setting same card as parentCard. Avoid listing templates board in copy/move/more menus](https://github.com/wekan/wekan/commit/745f39ed20169f56b99c0339f2043f8c4ed43873).
+  Thanks to andresmanelli.
+
+Thanks to above GitHub users for their contributions, and translators for their translations.
+
 # v2.40 2019-03-06 Wekan release
 
+This release fixes the following bugs:
+
 - Part 2: [Fix](https://github.com/wekan/wekan/commit/e845fe3e7130d111be4c3a73e2551738c980ff7b)
   [manifest](https://github.com/wekan/wekan/issues/2168) and
   [icon](https://github.com/wekan/wekan/issues/1692) paths. Thanks to xet7.
diff --git a/Stackerfile.yml b/Stackerfile.yml
index eb492c54..82172dc1 100644
--- a/Stackerfile.yml
+++ b/Stackerfile.yml
@@ -1,5 +1,5 @@
 appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928
-appVersion: "v2.40.0"
+appVersion: "v2.41.0"
 files:
   userUploads:
     - README.md
diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js
index 4df42586..9b47531f 100644
--- a/client/components/cards/cardDetails.js
+++ b/client/components/cards/cardDetails.js
@@ -430,6 +430,7 @@ BlazeComponent.extendComponent({
     const boards = Boards.find({
       archived: false,
       'members.userId': Meteor.userId(),
+      _id: {$ne: Meteor.user().getTemplatesBoardId()},
     }, {
       sort: ['title'],
     });
@@ -589,6 +590,9 @@ BlazeComponent.extendComponent({
     const boards = Boards.find({
       archived: false,
       'members.userId': Meteor.userId(),
+      _id: {
+        $ne: Meteor.user().getTemplatesBoardId(),
+      },
     }, {
       sort: ['title'],
     });
@@ -596,8 +600,12 @@ BlazeComponent.extendComponent({
   },
 
   cards() {
+    const currentId = Session.get('currentCard');
     if (this.parentBoard) {
-      return this.parentBoard.cards();
+      return Cards.find({
+        boardId: this.parentBoard,
+        _id: {$ne: currentId},
+      });
     } else {
       return [];
     }
diff --git a/package.json b/package.json
index 893a6a2a..82618ae2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v2.40.0",
+  "version": "v2.41.0",
   "description": "Open-Source kanban",
   "private": true,
   "scripts": {
diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp
index 302039ba..2ccffb09 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 = 242,
+    appVersion = 243,
     # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "2.40.0~2019-03-06"),
+    appMarketingVersion = (defaultText = "2.41.0~2019-03-07"),
     # Human-readable presentation of the app version.
 
     minUpgradableAppVersion = 0,