Prevent share permissions from being exceeded (#7317)

owncloud · Jul 22, 2022 · 7afb13f · 7afb13f
1 parent 009a265
commit 7afb13f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/changelog/unreleased/enhancement-ocis-resharing b/changelog/unreleased/enhancement-ocis-resharing
@@ -7,4 +7,5 @@ https://github.com/owncloud/web/pull/7086
 https://github.com/owncloud/web/pull/7247
 https://github.com/owncloud/web/issues/6894
 https://github.com/owncloud/web/pull/7243
+https://github.com/owncloud/web/pull/7317
 https://github.com/owncloud/web/issues/7225
diff --git a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/RoleDropdown.vue b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/RoleDropdown.vue
@@ -167,7 +167,7 @@ export default {
         return SpacePeopleShareRoles.list()
       }
 
-      if (this.resource.isReceivedShare() && this.resourceIsSharable && this.share) {
+      if (this.share?.incoming && this.resourceIsSharable) {
         return PeopleShareRoles.filterByBitmask(
           parseInt(this.share.permissions),
           this.resource.isFolder,
@@ -179,7 +179,7 @@ export default {
       return PeopleShareRoles.list(this.resource.isFolder, this.allowCustomSharing !== false)
     },
     availablePermissions() {
-      if (this.resource.isReceivedShare() && this.resourceIsSharable && this.share) {
+      if (this.share?.incoming && this.resourceIsSharable) {
         return SharePermissions.bitmaskToPermissions(parseInt(this.share.permissions))
       }
       return this.customPermissionsRole.permissions(this.allowSharePermission)

diff --git a/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue b/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue
@@ -219,7 +219,7 @@ export default defineComponent({
     },
 
     availableRoleOptions() {
-      if (this.highlightedFile.isReceivedShare() && this.canCreatePublicLinks && this.share) {
+      if (this.share?.incoming && this.canCreatePublicLinks) {
         return LinkShareRoles.filterByBitmask(
           parseInt(this.share.permissions),
           this.highlightedFile.isFolder,