ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #1728 from nextcloud/bugfix/url

Browse Source
This commit is contained in:
Julius Härtl
2020-04-21 09:21:37 +02:00
committed by GitHub
parent f34384b9df 35f8e5c4eb
commit 35f35297bc
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Notification/Notifier.php
View File

@@ -115,7 +115,7 @@ class Notifier implements INotifier {
] ]
] ]
); );
$notification->setLink($this->url->linkToRouteAbsolute('deck.page.index') . '#!/board/' . $boardId . '//card/' . $cardId . ''); $notification->setLink($this->url->linkToRouteAbsolute('deck.page.index') . '#!/board/' . $boardId . '/card/' . $cardId . '');
break; break;
case 'card-overdue': case 'card-overdue':
$cardId = $notification->getObjectId(); $cardId = $notification->getObjectId();
@@ -123,7 +123,7 @@ class Notifier implements INotifier {
$notification->setParsedSubject( $notification->setParsedSubject(
(string) $l->t('The card "%s" on "%s" has reached its due date.', $params) (string) $l->t('The card "%s" on "%s" has reached its due date.', $params)
); );
$notification->setLink($this->url->linkToRouteAbsolute('deck.page.index') . '#!/board/' . $boardId . '//card/' . $cardId . ''); $notification->setLink($this->url->linkToRouteAbsolute('deck.page.index') . '#!/board/' . $boardId . '/card/' . $cardId . '');
break; break;
case 'card-comment-mentioned': case 'card-comment-mentioned':
$cardId = $notification->getObjectId(); $cardId = $notification->getObjectId();
@@ -150,7 +150,7 @@ class Notifier implements INotifier {
if ($notification->getMessage() === '{message}') { if ($notification->getMessage() === '{message}') {
$notification->setParsedMessage($notification->getMessageParameters()['message']); $notification->setParsedMessage($notification->getMessageParameters()['message']);
} }
$notification->setLink($this->url->linkToRouteAbsolute('deck.page.index') . '#!/board/' . $boardId . '//card/' . $cardId . ''); $notification->setLink($this->url->linkToRouteAbsolute('deck.page.index') . '#!/board/' . $boardId . '/card/' . $cardId . '');
break; break;
case 'board-shared': case 'board-shared':
$boardId = $notification->getObjectId(); $boardId = $notification->getObjectId();

10
src/router.js
View File

@@ -42,7 +42,7 @@ export default new Router({
component: Boards, component: Boards,
}, },
{ {
path: '/boards', path: '/board',
name: 'boards', name: 'boards',
component: Boards, component: Boards,
props: { props: {
@@ -50,7 +50,7 @@ export default new Router({
}, },
}, },
{ {
path: '/boards/archived', path: '/board/archived',
name: 'boards.archived', name: 'boards.archived',
component: Boards, component: Boards,
props: { props: {
@@ -58,7 +58,7 @@ export default new Router({
}, },
}, },
{ {
path: '/boards/shared', path: '/board/shared',
name: 'boards.shared', name: 'boards.shared',
component: Boards, component: Boards,
props: { props: {
@@ -66,7 +66,7 @@ export default new Router({
}, },
}, },
{ {
path: '/boards/:id', path: '/board/:id',
name: 'board', name: 'board',
components: { components: {
default: Board, default: Board,
@@ -101,7 +101,7 @@ export default new Router({
}, },
}, },
{ {
path: 'cards/:cardId', path: 'card/:cardId',
name: 'card', name: 'card',
components: { components: {
sidebar: CardSidebar, sidebar: CardSidebar,