Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-18 00:10:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'nztqa-fix-filterreset' into devel

Browse source 
Fix filter reset on moving between starred boards. Thanks to nztqa !
This commit is contained in:
Lauri Ojansivu 2017-06-20 11:51:46 +03:00
commit 59b8d35386
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -15,7 +15,8 @@ and fixes the following bugs:
* [Fix Export Wekan board](https://github.com/wekan/wekan/pull/1067); * [Fix Export Wekan board](https://github.com/wekan/wekan/pull/1067);
* [Fix "W" shortcut binding](https://github.com/wekan/wekan/pull/1066); * [Fix "W" shortcut binding](https://github.com/wekan/wekan/pull/1066);
* [Fix login url in invitation email](https://github.com/wekan/wekan/issues/993); * [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 Thanks to GitHub users BaobabCoder, GhassenRjab, nebulade, nztqa and xet7
for their contributions. for their contributions.

1
config/router.js
View file

@ -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 // If we close a card, we'll execute again this route action but we don't
// want to excape every current actions (filters, etc.) // want to excape every current actions (filters, etc.)
if (previousBoard !== currentBoard) { if (previousBoard !== currentBoard) {
Filter.reset();
EscapeActions.executeAll(); EscapeActions.executeAll();
} else { } else {
EscapeActions.executeUpTo('popup-close'); EscapeActions.executeUpTo('popup-close');