Skip to content

[stable29] fix: Display 'Leave share' instead of 'Delete' #47895

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skjnldsv merged 2 commits into from
Sep 15, 2024
Merged

[stable29] fix: Display 'Leave share' instead of 'Delete' #47895

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c80dd9d
fix: Display 'Leave share' instead of 'Delete'
marcelklehr Aug 20, 2024
b9ef972
fix(files_sharing): adjust permissions from custom edit and delete ch…
skjnldsv Aug 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix: Display 'Leave share' instead of 'Delete' 
Signed-off-by: Marcel Klehr <[email protected]>
  • Loading branch information
@marcelklehr @backportbot
marcelklehr authored and backportbot[bot] committed Sep 11, 2024
commit c80dd9dfecbf5dc6cf8a827ef62f9c27eea7a776
4 changes: 4 additions & 0 deletions apps/files_sharing/lib/Controller/ShareAPIController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,10 @@ protected function formatShare(IShare $share, ?Node $recipientNode = null): arra
$result['item_permissions'] = $node->getPermissions();
}

// See MOUNT_ROOT_PROPERTYNAME dav property
$result['is-mount-root'] = $node->getInternalPath() === '';
$result['mount-type'] = $node->getMountPoint()->getMountType();

$result['mimetype'] = $node->getMimetype();
$result['has_preview'] = $this->previewManager->isAvailable($node);
$result['storage_id'] = $node->getStorage()->getId();
Expand Down
2 changes: 2 additions & 0 deletions apps/files_sharing/lib/ResponseDefinitions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
* file_target: string,
* has_preview: bool,
* hide_download: 0|1,
* is-mount-root: bool,
* id: string,
* item_mtime: int,
* item_permissions?: int,
Expand All @@ -48,6 +49,7 @@
* label: string,
* mail_send: 0|1,
* mimetype: string,
* mount-type: string,
* note: string,
* parent: null,
* password?: null|string,
Expand Down
8 changes: 8 additions & 0 deletions apps/files_sharing/openapi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,6 +480,7 @@
"file_target",
"has_preview",
"hide_download",
"is-mount-root",
"id",
"item_mtime",
"item_size",
Expand All @@ -488,6 +489,7 @@
"label",
"mail_send",
"mimetype",
"mount-type",
"note",
"parent",
"path",
Expand Down Expand Up @@ -543,6 +545,9 @@
1
]
},
"is-mount-root": {
"type": "boolean"
},
"id": {
"type": "string"
},
Expand Down Expand Up @@ -591,6 +596,9 @@
"mimetype": {
"type": "string"
},
"mount-type": {
"type": "string"
},
"note": {
"type": "string"
},
Expand Down