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

Merge pull request #22671 from owncloud/issue-22670 

Move the tag filter at the end for now
This commit is contained in:
Thomas Müller 2016-02-26 10:48:55 +01:00
parent 0795cc373d 4549b82553
commit e9237dd83c
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
apps/files/tests/controller/ViewControllerTest.php
View File

@ -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,
],

2
apps/systemtags/appinfo/app.php
View File

@ -83,7 +83,7 @@ $l = \OC::$server->getL10N('systemtags');
'id' => 'systemtagsfilter',
'appname' => 'systemtags',
'script' => 'list.php',
'order' => 9,
'order' => 25,
'name' => $l->t('Tags')
)
);