diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2016-02-26 10:48:55 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2016-02-26 10:48:55 +0100 |
| commit | e9237dd83ce50091274a52335846eb03f1694bb0 (patch) | |
| tree | 85b11970244715acd4b49df78799d8f7a2166b33 /apps | |
| parent | 0795cc373d667dbd515d7631131eebb1be47324c (diff) | |
| parent | 4549b825538d3cfa8c81387de70fb4756d5b97a9 (diff) | |
| download | nextcloud-server-e9237dd83ce50091274a52335846eb03f1694bb0.tar.gz nextcloud-server-e9237dd83ce50091274a52335846eb03f1694bb0.zip | |
Merge pull request #22671 from owncloud/issue-22670
Move the tag filter at the end for now
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files/tests/controller/ViewControllerTest.php | 50 | ||||
| -rw-r--r-- | apps/systemtags/appinfo/app.php | 2 |
2 files changed, 26 insertions, 26 deletions
diff --git a/apps/files/tests/controller/ViewControllerTest.php b/apps/files/tests/controller/ViewControllerTest.php index 28e2f0c2c9a..e91d40a0e6b 100644 --- a/apps/files/tests/controller/ViewControllerTest.php +++ b/apps/files/tests/controller/ViewControllerTest.php @@ -149,7 +149,7 @@ class ViewControllerTest extends TestCase { $nav = new Template('files', 'appnavigation'); $nav->assign('navigationItems', [ - 0 => [ + [ 'id' => 'files', 'appname' => 'files', 'script' => 'list.php', @@ -158,7 +158,7 @@ class ViewControllerTest extends TestCase { 'active' => false, 'icon' => '', ], - 1 => [ + [ 'id' => 'favorites', 'appname' => 'files', 'script' => 'simplelist.php', @@ -167,16 +167,7 @@ class ViewControllerTest extends TestCase { 'active' => false, 'icon' => '', ], - 2 => [ - 'id' => 'systemtagsfilter', - 'appname' => 'systemtags', - 'script' => 'list.php', - 'order' => 9, - 'name' => new \OC_L10N_String(new \OC_L10N('systemtags'), 'Tags', []), - 'active' => false, - 'icon' => '', - ], - 3 => [ + [ 'id' => 'sharingin', 'appname' => 'files_sharing', 'script' => 'list.php', @@ -185,7 +176,7 @@ class ViewControllerTest extends TestCase { 'active' => false, 'icon' => '', ], - 4 => [ + [ 'id' => 'sharingout', 'appname' => 'files_sharing', 'script' => 'list.php', @@ -194,7 +185,7 @@ class ViewControllerTest extends TestCase { 'active' => false, 'icon' => '', ], - 5 => [ + [ 'id' => 'sharinglinks', 'appname' => 'files_sharing', 'script' => 'list.php', @@ -203,7 +194,16 @@ class ViewControllerTest extends TestCase { 'active' => false, 'icon' => '', ], - 6 => [ + [ + 'id' => 'systemtagsfilter', + 'appname' => 'systemtags', + 'script' => 'list.php', + 'order' => 25, + 'name' => new \OC_L10N_String(new \OC_L10N('systemtags'), 'Tags', []), + 'active' => false, + 'icon' => '', + ], + [ 'id' => 'trashbin', 'appname' => 'files_trashbin', 'script' => 'list.php', @@ -227,31 +227,31 @@ class ViewControllerTest extends TestCase { 'allowShareWithLink' => 'yes', 'appNavigation' => $nav, 'appContents' => [ - 0 => [ + [ 'id' => 'files', 'content' => null, ], - 1 => [ + [ 'id' => 'favorites', 'content' => null, ], - 2 => [ - 'id' => 'systemtagsfilter', - 'content' => null, - ], - 3 => [ + [ 'id' => 'sharingin', 'content' => null, ], - 4 => [ + [ 'id' => 'sharingout', 'content' => null, ], - 5 => [ + [ 'id' => 'sharinglinks', 'content' => null, ], - 6 => [ + [ + 'id' => 'systemtagsfilter', + 'content' => null, + ], + [ 'id' => 'trashbin', 'content' => null, ], diff --git a/apps/systemtags/appinfo/app.php b/apps/systemtags/appinfo/app.php index 00663d5082b..f10d7f16cc8 100644 --- a/apps/systemtags/appinfo/app.php +++ b/apps/systemtags/appinfo/app.php @@ -83,7 +83,7 @@ $l = \OC::$server->getL10N('systemtags'); 'id' => 'systemtagsfilter', 'appname' => 'systemtags', 'script' => 'list.php', - 'order' => 9, + 'order' => 25, 'name' => $l->t('Tags') ) ); |