Browse Source
Merge pull request #10391 from nextcloud/bugfix/10389/fix-app-navigation-controller
Fix app navigation controller to return an array
pull/10394/head
Morris Jobke
8 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
5 additions and
4 deletions
-
core/Controller/NavigationController.php
-
settings/js/apps.js
-
tests/Core/Controller/NavigationControllerTest.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); |
|
|
|
|
|
|
|
@ -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++) { |
|
|
|
|
|
|
|
@ -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') |
|
|
|
|
