diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2019-07-05 14:53:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-05 14:53:03 +0200 |
| commit | 05db6481d7a2eb74085ce801a0feaac55d89d03d (patch) | |
| tree | 34e0d554a6ee32a8de692c6484be7e8cc5dae58c | |
| parent | eeeb5af52409466ceef780cf4eefd97f153d9920 (diff) | |
| parent | 857fae288caffe25ecb9d691dfbea74f4b041339 (diff) | |
| download | nextcloud-server-05db6481d7a2eb74085ce801a0feaac55d89d03d.tar.gz nextcloud-server-05db6481d7a2eb74085ce801a0feaac55d89d03d.zip | |
Merge pull request #16208 from nextcloud/bugfix/noid/user-share-displayname
Always set the display name for user shares
| -rw-r--r-- | lib/private/Share20/DefaultShareProvider.php | 4 | ||||
| -rw-r--r-- | tests/lib/Share20/DefaultShareProviderTest.php | 9 |
2 files changed, 13 insertions, 0 deletions
diff --git a/lib/private/Share20/DefaultShareProvider.php b/lib/private/Share20/DefaultShareProvider.php index 59aefd54cde..aea50dfcdb6 100644 --- a/lib/private/Share20/DefaultShareProvider.php +++ b/lib/private/Share20/DefaultShareProvider.php @@ -940,6 +940,10 @@ class DefaultShareProvider implements IShareProvider { if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER) { $share->setSharedWith($data['share_with']); + $user = $this->userManager->get($data['share_with']); + if ($user !== null) { + $share->setSharedWithDisplayName($user->getDisplayName()); + } } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) { $share->setSharedWith($data['share_with']); } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK) { diff --git a/tests/lib/Share20/DefaultShareProviderTest.php b/tests/lib/Share20/DefaultShareProviderTest.php index 578225840b6..f5f710cbbd3 100644 --- a/tests/lib/Share20/DefaultShareProviderTest.php +++ b/tests/lib/Share20/DefaultShareProviderTest.php @@ -1110,8 +1110,10 @@ class DefaultShareProviderTest extends \Test\TestCase { $user0 = $this->createMock(IUser::class); $user0->method('getUID')->willReturn('user0'); + $user0->method('getDisplayName')->willReturn('user0'); $user1 = $this->createMock(IUser::class); $user1->method('getUID')->willReturn('user1'); + $user0->method('getDisplayName')->willReturn('user0'); $this->userManager->method('get')->willReturnMap([ ['user0', $user0], @@ -1640,8 +1642,10 @@ class DefaultShareProviderTest extends \Test\TestCase { $user1 = $this->createMock(IUser::class); $user1->method('getUID')->willReturn('user1'); + $user1->method('getDisplayName')->willReturn('user1'); $user2 = $this->createMock(IUser::class); $user2->method('getUID')->willReturn('user2'); + $user2->method('getDisplayName')->willReturn('user2'); $this->userManager->method('get')->will($this->returnValueMap([ ['user1', $user1], ['user2', $user2], @@ -1691,8 +1695,10 @@ class DefaultShareProviderTest extends \Test\TestCase { $user1 = $this->createMock(IUser::class); $user1->method('getUID')->willReturn('user1'); + $user1->method('getDisplayName')->willReturn('user1'); $user2 = $this->createMock(IUser::class); $user2->method('getUID')->willReturn('user2'); + $user2->method('getDisplayName')->willReturn('user2'); $user3 = $this->createMock(IUser::class); $this->userManager->method('get')->will($this->returnValueMap([ ['user1', $user1], @@ -1755,6 +1761,7 @@ class DefaultShareProviderTest extends \Test\TestCase { for($i = 0; $i < 6; $i++) { $user = $this->createMock(IUser::class); $user->method('getUID')->willReturn('user'.$i); + $user->method('getDisplayName')->willReturn('user' . $i); $users['user'.$i] = $user; } @@ -2105,8 +2112,10 @@ class DefaultShareProviderTest extends \Test\TestCase { $user0 = $this->createMock(IUser::class); $user0->method('getUID')->willReturn('user0'); + $user0->method('getDisplayName')->willReturn('user0'); $user1 = $this->createMock(IUser::class); $user1->method('getUID')->willReturn('user1'); + $user1->method('getDisplayName')->willReturn('user1'); $this->userManager->method('get')->will($this->returnValueMap([ ['user0', $user0], |