diff options
| author | Lauri Ojansivu <x@xet7.org> | 2017-06-20 11:51:46 +0300 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2017-06-20 11:51:46 +0300 |
| commit | 59b8d35386949dd89588431aedbb75ed8b28db1d (patch) | |
| tree | ba822b6c5f755d3cdafeaf05325c94b5616e9542 | |
| parent | 82d289e899e0cc4aee8a5eb7949c1b8a162fe201 (diff) | |
| parent | 70233865d7f6efd1ecb69cddb5b6df76af79a21e (diff) | |
| download | wekan-59b8d35386949dd89588431aedbb75ed8b28db1d.tar.gz wekan-59b8d35386949dd89588431aedbb75ed8b28db1d.tar.bz2 wekan-59b8d35386949dd89588431aedbb75ed8b28db1d.zip | |
Merge branch 'nztqa-fix-filterreset' into devel
Fix filter reset on moving between starred boards. Thanks to nztqa !
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | config/router.js | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index a3511d1c..5a2aabe8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,7 +15,8 @@ and fixes the following bugs: * [Fix Export Wekan board](https://github.com/wekan/wekan/pull/1067); * [Fix "W" shortcut binding](https://github.com/wekan/wekan/pull/1066); * [Fix login url in invitation email](https://github.com/wekan/wekan/issues/993); -* [Edit card description with invalid markdown](https://github.com/wekan/wekan/pull/1073). +* [Edit card description with invalid markdown](https://github.com/wekan/wekan/pull/1073); +* [Fix filter reset on moving between starred boards](https://github.com/wekan/wekan/pull/1074). Thanks to GitHub users BaobabCoder, GhassenRjab, nebulade, nztqa and xet7 for their contributions. diff --git a/config/router.js b/config/router.js index 72592bd6..75f6ab58 100644 --- a/config/router.js +++ b/config/router.js @@ -31,6 +31,7 @@ FlowRouter.route('/b/:id/:slug', { // If we close a card, we'll execute again this route action but we don't // want to excape every current actions (filters, etc.) if (previousBoard !== currentBoard) { + Filter.reset(); EscapeActions.executeAll(); } else { EscapeActions.executeUpTo('popup-close'); |