From 6910ba95fae2da0eed07a0a6aa54d4d35abf56ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Tue, 19 May 2020 09:24:25 +0200 Subject: [PATCH] Fix generated fronted urls MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- lib/Activity/DeckProvider.php | 2 +- lib/Collaboration/Resources/ResourceProvider.php | 2 +- lib/Collaboration/Resources/ResourceProviderCard.php | 2 +- lib/Notification/Notifier.php | 8 ++++---- lib/Provider/DeckProvider.php | 2 +- tests/unit/Activity/DeckProviderTest.php | 6 +++--- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/Activity/DeckProvider.php b/lib/Activity/DeckProvider.php index 9bbb53bfb..7ac48ceab 100644 --- a/lib/Activity/DeckProvider.php +++ b/lib/Activity/DeckProvider.php @@ -357,6 +357,6 @@ class DeckProvider implements IProvider { } public function deckUrl($endpoint) { - return $this->urlGenerator->linkToRouteAbsolute('deck.page.index') . '#!' . $endpoint; + return $this->urlGenerator->linkToRouteAbsolute('deck.page.index') . '#' . $endpoint; } } diff --git a/lib/Collaboration/Resources/ResourceProvider.php b/lib/Collaboration/Resources/ResourceProvider.php index e00cc2de5..deffb475d 100644 --- a/lib/Collaboration/Resources/ResourceProvider.php +++ b/lib/Collaboration/Resources/ResourceProvider.php @@ -70,7 +70,7 @@ class ResourceProvider implements IProvider { */ public function getResourceRichObject(IResource $resource): array { $board = $this->getBoard($resource); - $link = \OC::$server->getURLGenerator()->linkToRoute('deck.page.index') . '#!/board/' . $resource->getId(); + $link = \OC::$server->getURLGenerator()->linkToRoute('deck.page.index') . '#/board/' . $resource->getId(); return [ 'type' => self::RESOURCE_TYPE, diff --git a/lib/Collaboration/Resources/ResourceProviderCard.php b/lib/Collaboration/Resources/ResourceProviderCard.php index a3808b77d..4d21fd16b 100644 --- a/lib/Collaboration/Resources/ResourceProviderCard.php +++ b/lib/Collaboration/Resources/ResourceProviderCard.php @@ -90,7 +90,7 @@ class ResourceProviderCard implements IProvider { throw new ResourceException('No unique card found for resource, this should never happen'); } - $link = $this->urlGenerator->linkToRoute('deck.page.index') . '#/board/' . $board->getId() . '/cards/' . $resource->getId(); + $link = $this->urlGenerator->linkToRoute('deck.page.index') . '#/board/' . $board->getId() . '/card/' . $resource->getId(); return [ 'type' => self::RESOURCE_TYPE, diff --git a/lib/Notification/Notifier.php b/lib/Notification/Notifier.php index 1365d8387..98c97dc5f 100644 --- a/lib/Notification/Notifier.php +++ b/lib/Notification/Notifier.php @@ -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; case 'card-overdue': $cardId = $notification->getObjectId(); @@ -123,7 +123,7 @@ class Notifier implements INotifier { $notification->setParsedSubject( (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; case 'card-comment-mentioned': $cardId = $notification->getObjectId(); @@ -150,7 +150,7 @@ class Notifier implements INotifier { if ($notification->getMessage() === '{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; case 'board-shared': $boardId = $notification->getObjectId(); @@ -173,7 +173,7 @@ class Notifier implements INotifier { ] ] ); - $notification->setLink($this->url->linkToRouteAbsolute('deck.page.index') . '#!/board/' . $boardId . '/'); + $notification->setLink($this->url->linkToRouteAbsolute('deck.page.index') . '#/board/' . $boardId . '/'); break; } return $notification; diff --git a/lib/Provider/DeckProvider.php b/lib/Provider/DeckProvider.php index ff33cfc2f..e886ed2f3 100644 --- a/lib/Provider/DeckProvider.php +++ b/lib/Provider/DeckProvider.php @@ -253,7 +253,7 @@ class DeckProvider implements IFullTextSearchProvider { try { $board = $this->fullTextSearchService->getBoardFromCardId((int)$document->getId()); - $path = '#!/board/' . $board->getId() . '//card/' . $document->getId(); + $path = '#/board/' . $board->getId() . '/card/' . $document->getId(); $document->setLink($this->urlGenerator->linkToRoute('deck.page.index') . $path); } catch (DoesNotExistException $e) { } catch (MultipleObjectsReturnedException $e) { diff --git a/tests/unit/Activity/DeckProviderTest.php b/tests/unit/Activity/DeckProviderTest.php index 07feaaa92..775bfc3ac 100644 --- a/tests/unit/Activity/DeckProviderTest.php +++ b/tests/unit/Activity/DeckProviderTest.php @@ -151,7 +151,7 @@ class DeckProviderTest extends TestCase { ->with('deck.page.index') ->willReturn('http://localhost/index.php/apps/deck/'); $this->assertEquals( - 'http://localhost/index.php/apps/deck/#!board/1/card/1', + 'http://localhost/index.php/apps/deck/#board/1/card/1', $this->provider->deckUrl('board/1/card/1') ); } @@ -186,7 +186,7 @@ class DeckProviderTest extends TestCase { 'type' => 'highlight', 'id' => 1, 'name' => 'Board', - 'link' => '#!/board/1', + 'link' => '#/board/1', ], 'user' => [ 'type' => 'user', @@ -303,7 +303,7 @@ class DeckProviderTest extends TestCase { 'type' => 'highlight', 'id' => 1, 'name' => 'Board name', - 'link' => '#!/board/1/', + 'link' => '#/board/1/', ], ]; $actual = $this->invokePrivate($this->provider, 'parseParamForBoard', ['board', $subjectParams, $params]);