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

Merge branch 'master' into broken

Browse source
This commit is contained in:
John R. Supplee 2021-01-10 18:19:33 +02:00
commit 4ebad9efc1
20 changed files with 643 additions and 620 deletions
Download patch file Download diff file Expand all files Collapse all files

20
config/router.js
View file

@ -116,8 +116,6 @@ FlowRouter.route('/shortcuts', {
FlowRouter.route('/my-cards', {
name: 'my-cards',
action() {
const myCardsTemplate = 'myCards';
Filter.reset();
// EscapeActions.executeAll();
EscapeActions.executeUpTo('popup-close');
@ -125,15 +123,9 @@ FlowRouter.route('/my-cards', {
Utils.manageCustomUI();
Utils.manageMatomo();
// if (previousPath) {
// Modal.open(myCardsTemplate, {
// header: 'myCardsModalTitle',
// onCloseGoTo: previousPath,
// });
// } else {
BlazeLayout.render('defaultLayout', {
headerBar: 'myCardsHeaderBar',
content: myCardsTemplate,
content: 'myCards',
});
// }
},
@ -142,8 +134,6 @@ FlowRouter.route('/my-cards', {
FlowRouter.route('/due-cards', {
name: 'due-cards',
action() {
const dueCardsTemplate = 'dueCards';
Filter.reset();
// EscapeActions.executeAll();
EscapeActions.executeUpTo('popup-close');
@ -151,15 +141,9 @@ FlowRouter.route('/due-cards', {
Utils.manageCustomUI();
Utils.manageMatomo();
// if (previousPath) {
// Modal.open(dueCardsTemplate, {
// header: 'dueCardsModalTitle',
// onCloseGoTo: previousPath,
// });
// } else {
BlazeLayout.render('defaultLayout', {
headerBar: 'dueCardsHeaderBar',
content: dueCardsTemplate,
content: 'dueCards',
});
// }
},