wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add missing share types when getting shares of a file

Browse source 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
This commit is contained in:
Daniel Calviño Sánchez 2019-10-25 10:40:11 +02:00
parent 24febe1e41
commit 222e5a9a9f
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/files_sharing/lib/Controller/ShareAPIController.php
View file

@ -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 = [];

8
apps/files_sharing/tests/Controller/ShareAPIControllerTest.php
View file

@ -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,
]
],
];