From ae367c7e97b99885c7cb1feadae22aa1bb6cb729 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 8 Feb 2016 17:02:05 +0100
Subject: Fix elementToFile to also return path when defined

Fixes issue when opening the share dialog for a file inside the favorite
list, and the file is from a subfolder
---
 apps/files/js/filelist.js           | 4 ++++
 apps/files/tests/js/filelistSpec.js | 6 ++++++
 2 files changed, 10 insertions(+)

(limited to 'apps/files')

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 35999b5d0ee..1a6f38d3d7c 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -815,6 +815,10 @@
 			if (mountType) {
 				data.mountType = mountType;
 			}
+			var path = $el.attr('data-path');
+			if (path) {
+				data.path = path;
+			}
 			return data;
 		},
 
diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js
index 1b2dd12213b..0091a9ee6e4 100644
--- a/apps/files/tests/js/filelistSpec.js
+++ b/apps/files/tests/js/filelistSpec.js
@@ -2521,6 +2521,12 @@ describe('OCA.Files.FileList tests', function() {
 			expect(fileInfo.size).toEqual(12);
 			expect(fileInfo.mimetype).toEqual('text/plain');
 			expect(fileInfo.type).toEqual('file');
+			expect(fileInfo.path).not.toBeDefined();
+		});
+		it('adds path attribute if available', function() {
+			$tr.attr('data-path', '/subdir');
+			var fileInfo = fileList.elementToFile($tr);
+			expect(fileInfo.path).toEqual('/subdir');
 		});
 	});
 	describe('new file menu', function() {
-- 
cgit v1.2.3


From 847a2426b8614b8fd5f7d05175dc4885a8a45e9c Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 9 Feb 2016 11:22:05 +0100
Subject: Fix unit tests for system tag filter section

---
 apps/files/tests/controller/ViewControllerTest.php | 25 ++++++++++++++++------
 apps/systemtags/appinfo/app.php                    |  2 +-
 2 files changed, 20 insertions(+), 7 deletions(-)

(limited to 'apps/files')

diff --git a/apps/files/tests/controller/ViewControllerTest.php b/apps/files/tests/controller/ViewControllerTest.php
index b5df3cfc904..28e2f0c2c9a 100644
--- a/apps/files/tests/controller/ViewControllerTest.php
+++ b/apps/files/tests/controller/ViewControllerTest.php
@@ -168,6 +168,15 @@ class ViewControllerTest extends TestCase {
 				'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',
@@ -176,7 +185,7 @@ class ViewControllerTest extends TestCase {
 				'active' => false,
 				'icon' => '',
 			],
-			3 => [
+			4 => [
 			'id' => 'sharingout',
 				'appname' => 'files_sharing',
 				'script' => 'list.php',
@@ -185,7 +194,7 @@ class ViewControllerTest extends TestCase {
 				'active' => false,
 				'icon' => '',
 			],
-			4 => [
+			5 => [
 				'id' => 'sharinglinks',
 				'appname' => 'files_sharing',
 				'script' => 'list.php',
@@ -194,7 +203,7 @@ class ViewControllerTest extends TestCase {
 				'active' => false,
 				'icon' => '',
 			],
-			5 => [
+			6 => [
 				'id' => 'trashbin',
 				'appname' => 'files_trashbin',
 				'script' => 'list.php',
@@ -227,18 +236,22 @@ class ViewControllerTest extends TestCase {
 						'content' => null,
 					],
 					2 => [
-						'id' => 'sharingin',
+						'id' => 'systemtagsfilter',
 						'content' => null,
 					],
 					3 => [
-						'id' => 'sharingout',
+						'id' => 'sharingin',
 						'content' => null,
 					],
 					4 => [
-						'id' => 'sharinglinks',
+						'id' => 'sharingout',
 						'content' => null,
 					],
 					5 => [
+						'id' => 'sharinglinks',
+						'content' => null,
+					],
+					6 => [
 						'id' => 'trashbin',
 						'content' => null,
 					],
diff --git a/apps/systemtags/appinfo/app.php b/apps/systemtags/appinfo/app.php
index 6bcbae4d0da..00663d5082b 100644
--- a/apps/systemtags/appinfo/app.php
+++ b/apps/systemtags/appinfo/app.php
@@ -76,7 +76,7 @@ $mapperListener = function(MapperEvent $event) use ($activityManager) {
 $eventDispatcher->addListener(MapperEvent::EVENT_ASSIGN, $mapperListener);
 $eventDispatcher->addListener(MapperEvent::EVENT_UNASSIGN, $mapperListener);
 
-$l = \OC::$server->getL10N('files_sharing');
+$l = \OC::$server->getL10N('systemtags');
 
 \OCA\Files\App::getNavigationManager()->add(
 	array(
-- 
cgit v1.2.3