mirror of
https://github.com/wekan/wekan.git
synced 2026-03-07 22:22:33 +01:00
Resolve merge conflicts by accepting PR #6131 changes
Co-authored-by: xet7 <15545+xet7@users.noreply.github.com>
This commit is contained in:
parent
dc0b68ee80
commit
97dd5d2064
257 changed files with 9483 additions and 14103 deletions
|
|
@ -136,8 +136,6 @@ FlowRouter.route('/public', {
|
|||
FlowRouter.route('/b/:boardId/:slug/:cardId', {
|
||||
name: 'card',
|
||||
action(params) {
|
||||
EscapeActions.executeUpTo('inlinedForm');
|
||||
|
||||
Session.set('currentBoard', params.boardId);
|
||||
Session.set('currentCard', params.cardId);
|
||||
Session.set('popupCardId', null);
|
||||
|
|
@ -163,6 +161,7 @@ FlowRouter.route('/b/:boardId/:slug/:cardId', {
|
|||
},
|
||||
});
|
||||
|
||||
|
||||
FlowRouter.route('/b/:id/:slug', {
|
||||
name: 'board',
|
||||
action(params) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue