summaryrefslogtreecommitdiffstats
path: root/client/config
diff options
context:
space:
mode:
authorMaxime Quandalle <maxime@quandalle.com>2015-09-10 19:25:15 +0200
committerMaxime Quandalle <maxime@quandalle.com>2015-09-10 19:25:15 +0200
commit0f014c954c587ae2c215689b4b70f626010f7cb8 (patch)
tree7a6e733d5ac2e9006744ba8cf708cd2bbed35767 /client/config
parentd01ffae999a4d6ec3cbd513347a06edf73f06427 (diff)
parent8cb45770647fd76fe03db94107eac09491ceee76 (diff)
downloadwekan-0f014c954c587ae2c215689b4b70f626010f7cb8.tar.gz
wekan-0f014c954c587ae2c215689b4b70f626010f7cb8.tar.bz2
wekan-0f014c954c587ae2c215689b4b70f626010f7cb8.zip
Merge branch 'master' into devel
Diffstat (limited to 'client/config')
-rw-r--r--client/config/router.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/client/config/router.js b/client/config/router.js
index 76d7b3ad..1cac43a0 100644
--- a/client/config/router.js
+++ b/client/config/router.js
@@ -40,11 +40,11 @@ FlowRouter.route('/b/:id/:slug', {
FlowRouter.route('/b/:boardId/:slug/:cardId', {
name: 'card',
action(params) {
+ EscapeActions.executeUpTo('inlinedForm');
+
Session.set('currentBoard', params.boardId);
Session.set('currentCard', params.cardId);
- EscapeActions.executeUpTo('inlinedForm');
-
BlazeLayout.render('defaultLayout', { content: 'board' });
},
});