summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2017-06-17 17:19:04 +0300
committerLauri Ojansivu <x@xet7.org>2017-06-17 17:19:04 +0300
commitb5c22e2a8a9d07ec47121464fe4eb1127f03c17a (patch)
treec5bfc428d2ebb8ad9c3dfa4466a2cc7d14e3703e
parent58b0be82113d51b7c40f54b01de65a6d8f727d74 (diff)
parent012ee672d337648cf86fb5118638e78ba87d4ecc (diff)
downloadwekan-b5c22e2a8a9d07ec47121464fe4eb1127f03c17a.tar.gz
wekan-b5c22e2a8a9d07ec47121464fe4eb1127f03c17a.tar.bz2
wekan-b5c22e2a8a9d07ec47121464fe4eb1127f03c17a.zip
Merge branch 'GhassenRjab-fix-export-path' into devel
Fix Export Wekan board. Thanks to GhassenRjab ! Closes #1061
-rw-r--r--CHANGELOG.md7
-rw-r--r--client/components/boards/boardHeader.js10
2 files changed, 11 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8684ebb..8062cbdd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,10 +9,11 @@ This release adds the following new features:
and fixes the following bugs:
-* [Fix IE 11 drag board to scroll](https://github.com/wekan/wekan/pull/1052).
+* [Fix IE 11 drag board to scroll](https://github.com/wekan/wekan/pull/1052);
+* [Fix Export Wekan board](https://github.com/wekan/wekan/pull/1067).
-Thanks to GitHub users BaobabCoder, nebulade and nztqa for their
-contributions.
+Thanks to GitHub users BaobabCoder, GhassenRjab, nebulade and nztqa
+for their contributions.
# v0.23 2017-05-21 Wekan release
diff --git a/client/components/boards/boardHeader.js b/client/components/boards/boardHeader.js
index ac5f9c33..06defbfa 100644
--- a/client/components/boards/boardHeader.js
+++ b/client/components/boards/boardHeader.js
@@ -17,9 +17,13 @@ Template.boardMenuPopup.events({
Template.boardMenuPopup.helpers({
exportUrl() {
- const boardId = Session.get('currentBoard');
- const loginToken = Accounts._storedLoginToken();
- return FlowRouter.url(`api/boards/${boardId}/export?authToken=${loginToken}`);
+ const params = {
+ boardId: Session.get('currentBoard'),
+ };
+ const queryParams = {
+ authToken: Accounts._storedLoginToken(),
+ };
+ return FlowRouter.path('/api/boards/:boardId/export', params, queryParams);
},
exportFilename() {
const boardId = Session.get('currentBoard');