diff options
| author | Christoph Wurst <christoph@winzerhof-wurst.at> | 2017-04-24 11:31:49 +0200 |
|---|---|---|
| committer | Christoph Wurst <christoph@winzerhof-wurst.at> | 2017-04-24 11:31:49 +0200 |
| commit | 026d509336775b9d6bf4c1d10849f03a2e9e5692 (patch) | |
| tree | 4ce36eaccb18281d52aa5e3f06bf08146161aa07 | |
| parent | a309d7c2802f654c5c13b76672620f438cffb9be (diff) | |
Redirect from UID to GID+UID
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| -rw-r--r-- | js/main.js | 6 | ||||
| -rw-r--r-- | lib/ContactsMenu/Providers/DetailsProvider.php | 3 | ||||
| -rw-r--r-- | tests/unit/ContactsMenu/Provider/DetailsProviderTest.php | 4 |
3 files changed, 9 insertions, 4 deletions
@@ -15,6 +15,12 @@ angular.module('contactsApp', ['uuid4', 'angular-cache', 'ngRoute', 'ui.bootstra template: '<contactdetails></contactdetails>' }); + $routeProvider.when('/contact/:uid', { + redirectTo: function(parameters) { + return '/' + t('contacts', 'All contacts') + '?uid=' + parameters.uid; + } + }); + $routeProvider.when('/:gid/:uid', { template: '<contactdetails></contactdetails>' }); diff --git a/lib/ContactsMenu/Providers/DetailsProvider.php b/lib/ContactsMenu/Providers/DetailsProvider.php index a2223555..5bbcd087 100644 --- a/lib/ContactsMenu/Providers/DetailsProvider.php +++ b/lib/ContactsMenu/Providers/DetailsProvider.php @@ -62,10 +62,9 @@ class DetailsProvider implements IProvider { return; } - // TODO: unique contact URL to the contacts app // TODO: l10n $iconUrl = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/info.svg')); - $contactsUrl = $this->urlGenerator->getAbsoluteURL('/index.php/apps/contacts'); + $contactsUrl = $this->urlGenerator->getAbsoluteURL('/index.php/apps/contacts#/contact/' . $uid); $action = $this->actionFactory->newLinkAction($iconUrl, 'Details', $contactsUrl); $action->setPriority(0); $entry->addAction($action); diff --git a/tests/unit/ContactsMenu/Provider/DetailsProviderTest.php b/tests/unit/ContactsMenu/Provider/DetailsProviderTest.php index 26f00575..8ee73d87 100644 --- a/tests/unit/ContactsMenu/Provider/DetailsProviderTest.php +++ b/tests/unit/ContactsMenu/Provider/DetailsProviderTest.php @@ -69,12 +69,12 @@ class DetailsProviderTest extends PHPUnit_Framework_TestCase { $this->urlGenerator->expects($this->exactly(2)) ->method('getAbsoluteURL') ->will($this->returnValueMap([ - ['/index.php/apps/contacts', 'cloud.example.com/index.php/apps/contacts'], + ['/index.php/apps/contacts#/contact/e3a71614-c602-4eb5-9994-47eec551542b', 'cloud.example.com/index.php/apps/contacts#/contact/e3a71614-c602-4eb5-9994-47eec551542b'], ['core/img/actions/info.svg', $iconUrl], ])); $this->actionFactory->expects($this->once()) ->method('newLinkAction') - ->with($this->equalTo($iconUrl), $this->equalTo('Details'), $this->equalTo('cloud.example.com/index.php/apps/contacts')) + ->with($this->equalTo($iconUrl), $this->equalTo('Details'), $this->equalTo('cloud.example.com/index.php/apps/contacts#/contact/e3a71614-c602-4eb5-9994-47eec551542b')) ->willReturn($action); $action->expects($this->once()) ->method('setPriority') |