Skip to content

Commit

Permalink
Merge pull request #36515 from nextcloud/fix/sharees-remove-deck
Browse files Browse the repository at this point in the history
  • Loading branch information
juliusknorr authored Feb 16, 2023
2 parents a5443ac + 30858df commit 38ca468
Showing 1 changed file with 1 addition and 10 deletions.
11 changes: 1 addition & 10 deletions apps/files_sharing/lib/Controller/ShareesAPIController.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
* @author Morris Jobke <hey@morrisjobke.de>
* @author Robin Appelman <robin@icewind.nl>
* @author Roeland Jago Douma <roeland@famdouma.nl>
* @author Kate Döen <kate.doeen@nextcloud.com>
*
* @license AGPL-3.0
*
Expand Down Expand Up @@ -85,7 +86,6 @@ class ShareesAPIController extends OCSController {
'emails' => [],
'circles' => [],
'rooms' => [],
'deck' => [],
],
'users' => [],
'groups' => [],
Expand All @@ -95,7 +95,6 @@ class ShareesAPIController extends OCSController {
'lookup' => [],
'circles' => [],
'rooms' => [],
'deck' => [],
'lookupEnabled' => false,
];

Expand Down Expand Up @@ -187,10 +186,6 @@ public function search(string $search = '', string $itemType = null, int $page =
if ($this->shareManager->shareProviderExists(IShare::TYPE_ROOM)) {
$shareTypes[] = IShare::TYPE_ROOM;
}

if ($this->shareManager->shareProviderExists(IShare::TYPE_DECK)) {
$shareTypes[] = IShare::TYPE_DECK;
}
} else {
if ($this->shareManager->allowGroupSharing()) {
$shareTypes[] = IShare::TYPE_GROUP;
Expand All @@ -203,10 +198,6 @@ public function search(string $search = '', string $itemType = null, int $page =
$shareTypes[] = IShare::TYPE_CIRCLE;
}

if ($this->shareManager->shareProviderExists(IShare::TYPE_DECK)) {
$shareTypes[] = IShare::TYPE_DECK;
}

if ($shareType !== null && is_array($shareType)) {
$shareTypes = array_intersect($shareTypes, $shareType);
} elseif (is_numeric($shareType)) {
Expand Down

0 comments on commit 38ca468

Please sign in to comment.