diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2014-07-16 14:25:48 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2014-07-16 14:25:48 +0200 |
| commit | 865de1926648c452009a32c8c4095de98d7de7b6 (patch) | |
| tree | 96a3346f264a488a35e10c2badae91e0b98dec87 | |
| parent | 4d74aa09bf7102a1104549b08c6bebe2382ec0cd (diff) | |
| parent | 658828867ca9379abdb411ec188a9d7a45794dd1 (diff) | |
| download | nextcloud-server-865de1926648c452009a32c8c4095de98d7de7b6.tar.gz nextcloud-server-865de1926648c452009a32c8c4095de98d7de7b6.zip | |
Merge pull request #9661 from owncloud/share-ownerdisplaynamefix
Correctly return the owner display name for children of shares
| -rw-r--r-- | apps/files_sharing/lib/cache.php | 2 | ||||
| -rw-r--r-- | apps/files_sharing/tests/cache.php | 19 |
2 files changed, 20 insertions, 1 deletions
diff --git a/apps/files_sharing/lib/cache.php b/apps/files_sharing/lib/cache.php index 6bc9e131949..209aa49dfa4 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 c5408ba55e7..8472c7f1ab0 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 |