mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #11259 from nextcloud/fix/11144/backport14 

[14] Fixes empty favorite names for trailing slashes
This commit is contained in:
Joas Schilling 2018-09-20 13:43:24 +02:00 committed by GitHub
parent 4d8f69f7a4 43889d1a49
commit 1f714124bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 70 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/files/lib/Controller/ViewController.php
View File

@ -176,7 +176,6 @@ class ViewController extends Controller {
$currentCount = 0; $currentCount = 0;
foreach ($favElements['folders'] as $dir) { foreach ($favElements['folders'] as $dir) {
$id = substr($dir, strrpos($dir, '/') + 1, strlen($dir));
$link = $this->urlGenerator->linkToRoute('files.view.index', ['dir' => $dir, 'view' => 'files']); $link = $this->urlGenerator->linkToRoute('files.view.index', ['dir' => $dir, 'view' => 'files']);
$sortingValue = ++$currentCount; $sortingValue = ++$currentCount;
$element = [ $element = [
@ -186,7 +185,7 @@ class ViewController extends Controller {
'dir' => $dir, 'dir' => $dir,
'order' => $navBarPositionPosition, 'order' => $navBarPositionPosition,
'folderPosition' => $sortingValue, 'folderPosition' => $sortingValue,
'name' => $id, 'name' => basename($dir),
'icon' => 'files', 'icon' => 'files',
'quickaccesselement' => 'true' 'quickaccesselement' => 'true'
]; ];

72
apps/files/tests/Controller/ViewControllerTest.php
View File

@ -176,8 +176,53 @@ class ViewControllerTest extends TestCase {
'active' => false, 'active' => false,
'icon' => '', 'icon' => '',
'type' => 'link', 'type' => 'link',
'classes' => '', 'classes' => 'collapsible',
'sublist' => [], 'sublist' => [
[
'id' => '-test1',
'view' => 'files',
'href' => '',
'dir' => '/test1',
'order' => 6,
'folderPosition' => 1,
'name' => 'test1',
'icon' => 'files',
'quickaccesselement' => 'true',
],
[
'name' => 'test2',
'id' => '-test2-',
'view' => 'files',
'href' => '',
'dir' => '/test2/',
'order' => 7,
'folderPosition' => 2,
'icon' => 'files',
'quickaccesselement' => 'true',
],
[
'name' => 'sub4',
'id' => '-test3-sub4',
'view' => 'files',
'href' => '',
'dir' => '/test3/sub4',
'order' => 8,
'folderPosition' => 3,
'icon' => 'files',
'quickaccesselement' => 'true',
],
[
'name' => 'sub6',
'id' => '-test5-sub6-',
'view' => 'files',
'href' => '',
'dir' => '/test5/sub6/',
'order' => 9,
'folderPosition' => 4,
'icon' => 'files',
'quickaccesselement' => 'true',
],
],
'defaultExpandedState' => false, 'defaultExpandedState' => false,
'expandedState' => 'show_Quick_Access' 'expandedState' => 'show_Quick_Access'
], ],
@ -303,6 +348,22 @@ class ViewControllerTest extends TestCase {
'id' => 'shareoverview', 'id' => 'shareoverview',
'content' => null, 'content' => null,
], ],
'-test1' => [
'id' => '-test1',
'content' => '',
],
'-test2-' => [
'id' => '-test2-',
'content' => '',
],
'-test3-sub4' => [
'id' => '-test3-sub4',
'content' => '',
],
'-test5-sub6-' => [
'id' => '-test5-sub6-',
'content' => '',
],
], ],
'hiddenFields' => [], 'hiddenFields' => [],
] ]
@ -315,7 +376,12 @@ class ViewControllerTest extends TestCase {
->with($this->user->getUID()) ->with($this->user->getUID())
->willReturn([ ->willReturn([
'item' => [], 'item' => [],
'folders' => [], 'folders' => [
'/test1',
'/test2/',
'/test3/sub4',
'/test5/sub6/',
],
]); ]);
$this->assertEquals($expected, $this->viewController->index('MyDir', 'MyView')); $this->assertEquals($expected, $this->viewController->index('MyDir', 'MyView'));