From 658828867ca9379abdb411ec188a9d7a45794dd1 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Wed, 16 Jul 2014 12:07:02 +0200
Subject: [PATCH] Correctly return the owner display name for children of
shares
---
apps/files_sharing/lib/cache.php | 2 +-
apps/files_sharing/tests/cache.php | 19 +++++++++++++++++++
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/apps/files_sharing/lib/cache.php b/apps/files_sharing/lib/cache.php
index 6bc9e13194..209aa49dfa 100644
--- a/apps/files_sharing/lib/cache.php
+++ b/apps/files_sharing/lib/cache.php
@@ -162,7 +162,7 @@ class Shared_Cache extends Cache {
foreach ($sourceFolderContent as $key => $c) {
$sourceFolderContent[$key]['path'] = $dir . $c['name'];
$sourceFolderContent[$key]['uid_owner'] = $parent['uid_owner'];
- $sourceFolderContent[$key]['displayname_owner'] = $parent['uid_owner'];
+ $sourceFolderContent[$key]['displayname_owner'] = \OC_User::getDisplayName($parent['uid_owner']);
$sourceFolderContent[$key]['permissions'] = $sourceFolderContent[$key]['permissions'] & $this->storage->getPermissions($dir . $c['name']);
}
diff --git a/apps/files_sharing/tests/cache.php b/apps/files_sharing/tests/cache.php
index c5408ba55e..8472c7f1ab 100644
--- a/apps/files_sharing/tests/cache.php
+++ b/apps/files_sharing/tests/cache.php
@@ -32,6 +32,9 @@ class Test_Files_Sharing_Cache extends Test_Files_Sharing_Base {
function setUp() {
parent::setUp();
+ \OC_User::setDisplayName(self::TEST_FILES_SHARING_API_USER1, 'User One');
+ \OC_User::setDisplayName(self::TEST_FILES_SHARING_API_USER2, 'User Two');
+
self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
$this->user2View = new \OC\Files\View('/'. self::TEST_FILES_SHARING_API_USER2 . '/files');
@@ -133,11 +136,15 @@ class Test_Files_Sharing_Cache extends Test_Files_Sharing_Base {
'name' => 'shareddir',
'path' => 'files/shareddir',
'mimetype' => 'httpd/unix-directory',
+ 'uid_owner' => self::TEST_FILES_SHARING_API_USER1,
+ 'displayname_owner' => 'User One',
),
array(
'name' => 'shared single file.txt',
'path' => 'files/shared single file.txt',
'mimetype' => 'text/plain',
+ 'uid_owner' => self::TEST_FILES_SHARING_API_USER1,
+ 'displayname_owner' => 'User One',
),
),
$results
@@ -153,16 +160,22 @@ class Test_Files_Sharing_Cache extends Test_Files_Sharing_Base {
'name' => 'bar.txt',
'path' => 'bar.txt',
'mimetype' => 'text/plain',
+ 'uid_owner' => self::TEST_FILES_SHARING_API_USER1,
+ 'displayname_owner' => 'User One',
),
array(
'name' => 'emptydir',
'path' => 'emptydir',
'mimetype' => 'httpd/unix-directory',
+ 'uid_owner' => self::TEST_FILES_SHARING_API_USER1,
+ 'displayname_owner' => 'User One',
),
array(
'name' => 'subdir',
'path' => 'subdir',
'mimetype' => 'httpd/unix-directory',
+ 'uid_owner' => self::TEST_FILES_SHARING_API_USER1,
+ 'displayname_owner' => 'User One',
),
),
$results
@@ -187,16 +200,22 @@ class Test_Files_Sharing_Cache extends Test_Files_Sharing_Base {
'name' => 'another too.txt',
'path' => 'another too.txt',
'mimetype' => 'text/plain',
+ 'uid_owner' => self::TEST_FILES_SHARING_API_USER1,
+ 'displayname_owner' => 'User One',
),
array(
'name' => 'another.txt',
'path' => 'another.txt',
'mimetype' => 'text/plain',
+ 'uid_owner' => self::TEST_FILES_SHARING_API_USER1,
+ 'displayname_owner' => 'User One',
),
array(
'name' => 'not a text file.xml',
'path' => 'not a text file.xml',
'mimetype' => 'application/xml',
+ 'uid_owner' => self::TEST_FILES_SHARING_API_USER1,
+ 'displayname_owner' => 'User One',
),
),
$results
--
GitLab