diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2020-11-20 10:04:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-20 10:04:54 +0100 |
| commit | 3839c8449a5f4944435dd8e8e9e5cd7b24b2420b (patch) | |
| tree | 673ec7166badb8e65eb738c01804fef402484103 | |
| parent | 10086b3f432525ede9a2100f117ccf766aa934bd (diff) | |
| parent | f65a89dd07cee3c07f9ac8a8120f1406dff4bd87 (diff) | |
| download | nextcloud-server-3839c8449a5f4944435dd8e8e9e5cd7b24b2420b.tar.gz nextcloud-server-3839c8449a5f4944435dd8e8e9e5cd7b24b2420b.zip | |
Merge pull request #24231 from nextcloud/backport/23757/stable20
[stable20] use file name instead of path in 'not allowed to share' message
| -rw-r--r-- | lib/private/Share20/Manager.php | 3 | ||||
| -rw-r--r-- | tests/lib/Share20/ManagerTest.php | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php index fad18dd2859..3a3d827caf4 100644 --- a/lib/private/Share20/Manager.php +++ b/lib/private/Share20/Manager.php @@ -287,8 +287,7 @@ class Manager implements IManager { // Check if we actually have share permissions if (!$share->getNode()->isShareable()) { - $path = $userFolder->getRelativePath($share->getNode()->getPath()); - $message_t = $this->l->t('You are not allowed to share %s', [$path]); + $message_t = $this->l->t('You are not allowed to share %s', [$share->getNode()->getName()]); throw new GenericShareException($message_t, $message_t, 404); } diff --git a/tests/lib/Share20/ManagerTest.php b/tests/lib/Share20/ManagerTest.php index 0e2b244fdc9..138c3025c86 100644 --- a/tests/lib/Share20/ManagerTest.php +++ b/tests/lib/Share20/ManagerTest.php @@ -601,20 +601,22 @@ class ManagerTest extends \Test\TestCase { $nonShareAble = $this->createMock(Folder::class); $nonShareAble->method('isShareable')->willReturn(false); $nonShareAble->method('getPath')->willReturn('path'); + $nonShareAble->method('getName')->willReturn('name'); $nonShareAble->method('getOwner') ->willReturn($owner); $nonShareAble->method('getStorage') ->willReturn($storage); - $data[] = [$this->createShare(null, IShare::TYPE_USER, $nonShareAble, $user2, $user0, $user0, 31, null, null), 'You are not allowed to share path', true]; - $data[] = [$this->createShare(null, IShare::TYPE_GROUP, $nonShareAble, $group0, $user0, $user0, 31, null, null), 'You are not allowed to share path', true]; - $data[] = [$this->createShare(null, IShare::TYPE_LINK, $nonShareAble, null, $user0, $user0, 31, null, null), 'You are not allowed to share path', true]; + $data[] = [$this->createShare(null, IShare::TYPE_USER, $nonShareAble, $user2, $user0, $user0, 31, null, null), 'You are not allowed to share name', true]; + $data[] = [$this->createShare(null, IShare::TYPE_GROUP, $nonShareAble, $group0, $user0, $user0, 31, null, null), 'You are not allowed to share name', true]; + $data[] = [$this->createShare(null, IShare::TYPE_LINK, $nonShareAble, null, $user0, $user0, 31, null, null), 'You are not allowed to share name', true]; $limitedPermssions = $this->createMock(File::class); $limitedPermssions->method('isShareable')->willReturn(true); $limitedPermssions->method('getPermissions')->willReturn(\OCP\Constants::PERMISSION_READ); $limitedPermssions->method('getId')->willReturn(108); $limitedPermssions->method('getPath')->willReturn('path'); + $limitedPermssions->method('getName')->willReturn('name'); $limitedPermssions->method('getOwner') ->willReturn($owner); $limitedPermssions->method('getStorage') @@ -637,6 +639,7 @@ class ManagerTest extends \Test\TestCase { $nonMoveableMountPermssions->method('getPermissions')->willReturn(\OCP\Constants::PERMISSION_READ); $nonMoveableMountPermssions->method('getId')->willReturn(108); $nonMoveableMountPermssions->method('getPath')->willReturn('path'); + $nonMoveableMountPermssions->method('getName')->willReturn('name'); $nonMoveableMountPermssions->method('getOwner') ->willReturn($owner); $nonMoveableMountPermssions->method('getStorage') |