diff options
| author | Daniel Calviño Sánchez <danxuliu@gmail.com> | 2019-10-25 11:40:11 +0300 |
|---|---|---|
| committer | Daniel Calviño Sánchez <danxuliu@gmail.com> | 2019-10-25 22:39:49 +0300 |
| commit | 222e5a9a9fdb188589adc9eed9d6a843d9e9eff5 (patch) | |
| tree | 7b45d326ce828b5518c28aeca9c13e455073cab2 | |
| parent | 24febe1e4145e8446ff8572fe84d78495c45ed38 (diff) | |
Add missing share types when getting shares of a file
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| -rw-r--r-- | apps/files_sharing/lib/Controller/ShareAPIController.php | 4 | ||||
| -rw-r--r-- | apps/files_sharing/tests/Controller/ShareAPIControllerTest.php | 8 |
2 files changed, 12 insertions, 0 deletions
diff --git a/apps/files_sharing/lib/Controller/ShareAPIController.php b/apps/files_sharing/lib/Controller/ShareAPIController.php index 8b5ad12ae52..90d739c5bc1 100644 --- a/apps/files_sharing/lib/Controller/ShareAPIController.php +++ b/apps/files_sharing/lib/Controller/ShareAPIController.php @@ -629,10 +629,14 @@ class ShareAPIController extends OCSController { $shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_GROUP, $node, true, -1, 0)); $shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_LINK, $node, true, -1, 0)); $shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_EMAIL, $node, true, -1, 0)); + $shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_CIRCLE, $node, true, -1, 0)); $shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_ROOM, $node, true, -1, 0)); if ($this->shareManager->outgoingServer2ServerSharesAllowed()) { $shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_REMOTE, $node, true, -1, 0)); } + if ($this->shareManager->outgoingServer2ServerGroupSharesAllowed()) { + $shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_REMOTE_GROUP, $node, true, -1, 0)); + } } $formatted = $miniFormatted = []; diff --git a/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php b/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php index 3e0dc29fe95..7c77406e4b5 100644 --- a/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php +++ b/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php @@ -1251,8 +1251,10 @@ class ShareAPIControllerTest extends TestCase { IShare::TYPE_GROUP => [$file1GroupShareOwner], IShare::TYPE_LINK => [$file1LinkShareOwner], IShare::TYPE_EMAIL => [$file1EmailShareOwner], + IShare::TYPE_CIRCLE => [$file1CircleShareOwner], IShare::TYPE_ROOM => [$file1RoomShareOwner], IShare::TYPE_REMOTE => [$file1RemoteShareOwner], + IShare::TYPE_REMOTE_GROUP => [$file1RemoteGroupShareOwner], ], ], [ @@ -1262,6 +1264,7 @@ class ShareAPIControllerTest extends TestCase { $file1GroupShareOwnerExpected, $file1LinkShareOwnerExpected, $file1EmailShareOwnerExpected, + $file1CircleShareOwnerExpected, $file1RoomShareOwnerExpected, ] ], @@ -1276,20 +1279,25 @@ class ShareAPIControllerTest extends TestCase { IShare::TYPE_GROUP => [$file1GroupShareOwner], IShare::TYPE_LINK => [$file1LinkShareOwner], IShare::TYPE_EMAIL => [$file1EmailShareOwner], + IShare::TYPE_CIRCLE => [$file1CircleShareOwner], IShare::TYPE_ROOM => [$file1RoomShareOwner], IShare::TYPE_REMOTE => [$file1RemoteShareOwner], + IShare::TYPE_REMOTE_GROUP => [$file1RemoteGroupShareOwner], ], ], [ IShare::TYPE_REMOTE => true, + IShare::TYPE_REMOTE_GROUP => true, ], [ $file1UserShareOwnerExpected, $file1GroupShareOwnerExpected, $file1LinkShareOwnerExpected, $file1EmailShareOwnerExpected, + $file1CircleShareOwnerExpected, $file1RoomShareOwnerExpected, $file1RemoteShareOwnerExpected, + $file1RemoteGroupShareOwnerExpected, ] ], ]; |