Skip to content

Commit 3c693db

Browse files
authored
Merge pull request #24605 from nextcloud/enh/share-deck
Add deck share provider support
2 parents 16be144 + c4ea37b commit 3c693db

32 files changed

Lines changed: 279 additions & 35 deletions

apps/admin_audit/lib/Actions/Sharing.php

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,19 @@ public function shared(array $params) {
146146
'id',
147147
]
148148
);
149+
} elseif ($params['shareType'] === IShare::TYPE_DECK) {
150+
$this->log(
151+
'The %s "%s" with ID "%s" has been shared to the deck card "%s" with permissions "%s" (Share ID: %s)',
152+
$params,
153+
[
154+
'itemType',
155+
'itemTarget',
156+
'itemSource',
157+
'shareWith',
158+
'permissions',
159+
'id',
160+
]
161+
);
149162
}
150163
}
151164

@@ -250,6 +263,18 @@ public function unshare(array $params) {
250263
'id',
251264
]
252265
);
266+
} elseif ($params['shareType'] === IShare::TYPE_DECK) {
267+
$this->log(
268+
'The %s "%s" with ID "%s" has been unshared from the deck card "%s" (Share ID: %s)',
269+
$params,
270+
[
271+
'itemType',
272+
'fileTarget',
273+
'itemSource',
274+
'shareWith',
275+
'id',
276+
]
277+
);
253278
}
254279
}
255280

apps/dav/lib/Connector/Sabre/SharesPlugin.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ private function getShare(\OCP\Files\Node $node): array {
121121
IShare::TYPE_EMAIL,
122122
IShare::TYPE_ROOM,
123123
IShare::TYPE_CIRCLE,
124+
IShare::TYPE_DECK,
124125
];
125126
foreach ($requestedShareTypes as $requestedShareType) {
126127
$shares = $this->shareManager->getSharesBy(

apps/dav/tests/unit/Connector/Sabre/SharesPluginTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,7 @@ public function sharesGetPropertiesDataProvider() {
276276
[[IShare::TYPE_LINK]],
277277
[[IShare::TYPE_REMOTE]],
278278
[[IShare::TYPE_ROOM]],
279+
[[IShare::TYPE_DECK]],
279280
[[IShare::TYPE_USER, IShare::TYPE_GROUP]],
280281
[[IShare::TYPE_USER, IShare::TYPE_GROUP, IShare::TYPE_LINK]],
281282
[[IShare::TYPE_USER, IShare::TYPE_LINK]],

apps/files/lib/Controller/ApiController.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,8 @@ private function getShareTypes(Node $node) {
221221
IShare::TYPE_LINK,
222222
IShare::TYPE_REMOTE,
223223
IShare::TYPE_EMAIL,
224-
IShare::TYPE_ROOM
224+
IShare::TYPE_ROOM,
225+
IShare::TYPE_DECK,
225226
];
226227
foreach ($requestedShareTypes as $requestedShareType) {
227228
// one of each type is enough to find out about the types

apps/files/lib/Service/OwnershipTransferService.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ private function collectUsersShares(string $sourceUid,
252252

253253
$shares = [];
254254
$progress = new ProgressBar($output);
255-
foreach ([IShare::TYPE_GROUP, IShare::TYPE_USER, IShare::TYPE_LINK, IShare::TYPE_REMOTE, IShare::TYPE_ROOM, IShare::TYPE_EMAIL, IShare::TYPE_CIRCLE] as $shareType) {
255+
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) {
256256
$offset = 0;
257257
while (true) {
258258
$sharePage = $this->shareManager->getSharesBy($sourceUid, $shareType, null, true, 50, $offset);

apps/files_sharing/js/dist/additionalScripts.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/files_sharing/js/dist/additionalScripts.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/files_sharing/js/dist/files_sharing_tab.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/files_sharing/js/dist/files_sharing_tab.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/files_sharing/js/dist/main.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)