github-mirrors/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-04-23 05:27:14 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3686 from ednamaeG/sort-fix

Browse source 
fixed sort reset
This commit is contained in:
Lauri Ojansivu 2021-03-31 13:13:44 +03:00 • committed by GitHub
commit 69509d597f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/components/boards/boardHeader.js
View file

@ -54,10 +54,6 @@ Template.boardChangeTitlePopup.events({
});
BlazeComponent.extendComponent({
onCreated() {
// set sort to default
Session.set('sortBy', '');
},
watchLevel() {
const currentBoard = Boards.findOne(Session.get('currentBoard'));
return currentBoard && currentBoard.getWatchLevel(Meteor.userId());

11
config/router.js
View file

@ -14,6 +14,7 @@ FlowRouter.route('/', {
Session.set('currentCard', null);
Filter.reset();
Session.set('sortBy', '')
EscapeActions.executeAll();
Utils.manageCustomUI();
@ -35,6 +36,7 @@ FlowRouter.route('/public', {
Session.set('currentCard', null);
Filter.reset();
Session.set('sortBy', '')
EscapeActions.executeAll();
Utils.manageCustomUI();
@ -59,6 +61,7 @@ FlowRouter.route('/b/:id/:slug', {
// want to excape every current actions (filters, etc.)
if (previousBoard !== currentBoard) {
Filter.reset();
Session.set('sortBy', '')
EscapeActions.executeAll();
} else {
EscapeActions.executeUpTo('popup-close');
@ -118,6 +121,7 @@ FlowRouter.route('/my-cards', {
triggersEnter: [AccountsTemplates.ensureSignedIn],
action() {
Filter.reset();
Session.set('sortBy', '')
// EscapeActions.executeAll();
EscapeActions.executeUpTo('popup-close');
@ -137,6 +141,7 @@ FlowRouter.route('/due-cards', {
triggersEnter: [AccountsTemplates.ensureSignedIn],
action() {
Filter.reset();
Session.set('sortBy', '')
// EscapeActions.executeAll();
EscapeActions.executeUpTo('popup-close');
@ -156,6 +161,7 @@ FlowRouter.route('/global-search', {
triggersEnter: [AccountsTemplates.ensureSignedIn],
action() {
Filter.reset();
Session.set('sortBy', '')
// EscapeActions.executeAll();
EscapeActions.executeUpTo('popup-close');
@ -182,6 +188,7 @@ FlowRouter.route('/broken-cards', {
const brokenCardsTemplate = 'brokenCards';
Filter.reset();
Session.set('sortBy', '')
// EscapeActions.executeAll();
EscapeActions.executeUpTo('popup-close');
@ -208,6 +215,7 @@ FlowRouter.route('/import/:source', {
Session.set('importSource', params.source);
Filter.reset();
Session.set('sortBy', '')
EscapeActions.executeAll();
BlazeLayout.render('defaultLayout', {
headerBar: 'importHeaderBar',
@ -226,6 +234,7 @@ FlowRouter.route('/setting', {
Session.set('currentCard', null);
Filter.reset();
Session.set('sortBy', '')
EscapeActions.executeAll();
},
],
@ -248,6 +257,7 @@ FlowRouter.route('/information', {
Session.set('currentCard', null);
Filter.reset();
Session.set('sortBy', '')
EscapeActions.executeAll();
},
],
@ -269,6 +279,7 @@ FlowRouter.route('/people', {
Session.set('currentCard', null);
Filter.reset();
Session.set('sortBy', '')
EscapeActions.executeAll();
},
],