Browse Source

Merge branch 'GhassenRjab-fix-export-path' into devel

Fix Export Wekan board. Thanks to GhassenRjab ! Closes #1061
Lauri Ojansivu 8 years ago
parent
commit
b5c22e2a8a
2 changed files with 11 additions and 6 deletions
  1. 4 3
      CHANGELOG.md
  2. 7 3
      client/components/boards/boardHeader.js

+ 4 - 3
CHANGELOG.md

@@ -9,10 +9,11 @@ This release adds the following new features:
 
 
 and fixes the following bugs:
 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
 # v0.23 2017-05-21 Wekan release
 
 

+ 7 - 3
client/components/boards/boardHeader.js

@@ -17,9 +17,13 @@ Template.boardMenuPopup.events({
 
 
 Template.boardMenuPopup.helpers({
 Template.boardMenuPopup.helpers({
   exportUrl() {
   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() {
   exportFilename() {
     const boardId = Session.get('currentBoard');
     const boardId = Session.get('currentBoard');