summaryrefslogtreecommitdiffstats
path: root/apps/files
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2020-12-10 14:30:08 +0100
committerGitHub <noreply@github.com>2020-12-10 14:30:08 +0100
commit3c693db0ca770fccd5521ecdc4da6d77ae966a73 (patch)
tree387539171b181bc1169c7ab81abf2ab2729e8486 /apps/files
parent16be144aab96796f093b557f29652e277482a2c3 (diff)
parentc4ea37b8a102adec16cf13085dba2fd7ef893195 (diff)
downloadnextcloud-server-3c693db0ca770fccd5521ecdc4da6d77ae966a73.tar.gz
nextcloud-server-3c693db0ca770fccd5521ecdc4da6d77ae966a73.zip
Merge pull request #24605 from nextcloud/enh/share-deck
Add deck share provider support
Diffstat (limited to 'apps/files')
-rw-r--r--apps/files/lib/Controller/ApiController.php3
-rw-r--r--apps/files/lib/Service/OwnershipTransferService.php2
2 files changed, 3 insertions, 2 deletions
diff --git a/apps/files/lib/Controller/ApiController.php b/apps/files/lib/Controller/ApiController.php
index ee4d86bc360..f7a0674eff0 100644
--- a/apps/files/lib/Controller/ApiController.php
+++ b/apps/files/lib/Controller/ApiController.php
@@ -221,7 +221,8 @@ class ApiController extends Controller {
IShare::TYPE_LINK,
IShare::TYPE_REMOTE,
IShare::TYPE_EMAIL,
- IShare::TYPE_ROOM
+ IShare::TYPE_ROOM,
+ IShare::TYPE_DECK,
];
foreach ($requestedShareTypes as $requestedShareType) {
// one of each type is enough to find out about the types
diff --git a/apps/files/lib/Service/OwnershipTransferService.php b/apps/files/lib/Service/OwnershipTransferService.php
index fa979c2006a..bd8520b92fc 100644
--- a/apps/files/lib/Service/OwnershipTransferService.php
+++ b/apps/files/lib/Service/OwnershipTransferService.php
@@ -252,7 +252,7 @@ class OwnershipTransferService {
$shares = [];
$progress = new ProgressBar($output);
- foreach ([IShare::TYPE_GROUP, IShare::TYPE_USER, IShare::TYPE_LINK, IShare::TYPE_REMOTE, IShare::TYPE_ROOM, IShare::TYPE_EMAIL, IShare::TYPE_CIRCLE] as $shareType) {
+ foreach ([IShare::TYPE_GROUP, IShare::TYPE_USER, IShare::TYPE_LINK, IShare::TYPE_REMOTE, IShare::TYPE_ROOM, IShare::TYPE_EMAIL, IShare::TYPE_CIRCLE, IShare::TYPE_DECK] as $shareType) {
$offset = 0;
while (true) {
$sharePage = $this->shareManager->getSharesBy($sourceUid, $shareType, null, true, 50, $offset);