diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-07-25 14:11:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-25 14:11:49 +0200 |
| commit | 70fa73404f9de1545e9907668a9369346cc66507 (patch) | |
| tree | 0ff605b97af1caa819c558bc06f77b67f09439a6 | |
| parent | ebeaa37da26e55e5511e080a0d827715e32146fe (diff) | |
| parent | 4c773891d738c732f525030aa1d0dd187c4221ec (diff) | |
| download | nextcloud-server-70fa73404f9de1545e9907668a9369346cc66507.tar.gz nextcloud-server-70fa73404f9de1545e9907668a9369346cc66507.zip | |
Merge pull request #10391 from nextcloud/bugfix/10389/fix-app-navigation-controller
Fix app navigation controller to return an array
| -rw-r--r-- | core/Controller/NavigationController.php | 3 | ||||
| -rw-r--r-- | settings/js/apps.js | 2 | ||||
| -rw-r--r-- | tests/Core/Controller/NavigationControllerTest.php | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/core/Controller/NavigationController.php b/core/Controller/NavigationController.php index 2397fb3c7b4..eb3b0968da3 100644 --- a/core/Controller/NavigationController.php +++ b/core/Controller/NavigationController.php @@ -55,7 +55,7 @@ class NavigationController extends OCSController { if ($absolute) { $navigation = $this->rewriteToAbsoluteUrls($navigation); } - + $navigation = array_values($navigation); $etag = $this->generateETag($navigation); if ($this->request->getHeader('If-None-Match') === $etag) { return new DataResponse([], Http::STATUS_NOT_MODIFIED); @@ -77,6 +77,7 @@ class NavigationController extends OCSController { if ($absolute) { $navigation = $this->rewriteToAbsoluteUrls($navigation); } + $navigation = array_values($navigation); $etag = $this->generateETag($navigation); if ($this->request->getHeader('If-None-Match') === $etag) { return new DataResponse([], Http::STATUS_NOT_MODIFIED); diff --git a/settings/js/apps.js b/settings/js/apps.js index c9b1ea6b8d4..641e8999b19 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -6,7 +6,7 @@ OC.Settings.Apps = OC.Settings.Apps || { if(response.ocs.meta.status === 'ok') { var addedApps = {}; var navEntries = response.ocs.data; - var container = $('#navigation #apps'); + var container = $('#navigation #apps ul'); // remove disabled apps for (var i = 0; i < navEntries.length; i++) { diff --git a/tests/Core/Controller/NavigationControllerTest.php b/tests/Core/Controller/NavigationControllerTest.php index 86173405c1c..4095526fc0b 100644 --- a/tests/Core/Controller/NavigationControllerTest.php +++ b/tests/Core/Controller/NavigationControllerTest.php @@ -69,7 +69,7 @@ class NavigationControllerTest extends TestCase { $this->navigationManager->expects($this->once()) ->method('getAll') ->with('link') - ->willReturn([ ['id' => 'files', 'href' => '/index.php/apps/files', 'icon' => 'icon' ] ]); + ->willReturn(['files' => ['id' => 'files', 'href' => '/index.php/apps/files', 'icon' => 'icon' ] ]); if ($absolute) { $this->urlGenerator->expects($this->any()) ->method('getBaseURL') @@ -102,7 +102,7 @@ class NavigationControllerTest extends TestCase { $this->navigationManager->expects($this->once()) ->method('getAll') ->with('settings') - ->willReturn([ ['id' => 'settings', 'href' => '/index.php/settings/user', 'icon' => '/core/img/settings.svg'] ]); + ->willReturn(['settings' => ['id' => 'settings', 'href' => '/index.php/settings/user', 'icon' => '/core/img/settings.svg'] ]); if ($absolute) { $this->urlGenerator->expects($this->any()) ->method('getBaseURL') |