Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 14 additions & 0 deletions apps/files_sharing/src/mixins/ShareDetails.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

import Share from '../models/Share.ts'
import Config from '../services/ConfigService.ts'
import { ATOMIC_PERMISSIONS } from '../lib/SharePermissionsToolBox.js'
import logger from '../services/logger.ts'

export default {
methods: {
Expand All @@ -26,6 +28,18 @@ export default {
share = this.mapShareRequestToShareObject(shareRequestObject)
}

if (this.fileInfo.type !== 'dir') {
const originalPermissions = share.permissions
const strippedPermissions = originalPermissions
& ~ATOMIC_PERMISSIONS.CREATE
& ~ATOMIC_PERMISSIONS.DELETE

if (originalPermissions !== strippedPermissions) {
logger.debug('Removed create/delete permissions from file share (only valid for folders)')
share.permissions = strippedPermissions
}
}

const shareDetails = {
fileInfo: this.fileInfo,
share,
Expand Down
23 changes: 20 additions & 3 deletions apps/files_sharing/src/views/SharingDetailsTab.vue
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<NcCheckboxRadioSwitch :button-variant="true"
data-cy-files-sharing-share-permissions-bundle="upload-edit"
:checked.sync="sharingPermission"
:value="bundledPermissions.ALL.toString()"
:value="allPermissions"
name="sharing_permission_radio"
type="radio"
button-variant-grouped="vertical"
Expand Down Expand Up @@ -400,6 +400,9 @@ export default {
}
}
},
allPermissions() {
return this.isFolder ? this.bundledPermissions.ALL.toString() : this.bundledPermissions.ALL_FILE.toString()
},
/**
* Can the sharee edit the shared file ?
*/
Expand Down Expand Up @@ -712,8 +715,15 @@ export default {
[ATOMIC_PERMISSIONS.DELETE]: this.t('files_sharing', 'Delete'),
}

return [ATOMIC_PERMISSIONS.READ, ATOMIC_PERMISSIONS.CREATE, ATOMIC_PERMISSIONS.UPDATE, ...(this.resharingIsPossible ? [ATOMIC_PERMISSIONS.SHARE] : []), ATOMIC_PERMISSIONS.DELETE]
.filter((permission) => hasPermissions(this.share.permissions, permission))
const permissionsList = [
ATOMIC_PERMISSIONS.READ,
...(this.isFolder ? [ATOMIC_PERMISSIONS.CREATE] : []),
ATOMIC_PERMISSIONS.UPDATE,
...(this.resharingIsPossible ? [ATOMIC_PERMISSIONS.SHARE] : []),
...(this.isFolder ? [ATOMIC_PERMISSIONS.DELETE] : []),
]

return permissionsList.filter((permission) => hasPermissions(this.share.permissions, permission))
.map((permission, index) => index === 0
? translatedPermissions[permission]
: translatedPermissions[permission].toLocaleLowerCase(getLanguage()))
Expand Down Expand Up @@ -831,6 +841,13 @@ export default {
isReshareChecked = this.canReshare,
} = {}) {
// calc permissions if checked

if (!this.isFolder && (isCreateChecked || isDeleteChecked)) {
logger.debug('Ignoring create/delete permissions for file share — only available for folders')
isCreateChecked = false
isDeleteChecked = false
}

const permissions = 0
| (isReadChecked ? ATOMIC_PERMISSIONS.READ : 0)
| (isCreateChecked ? ATOMIC_PERMISSIONS.CREATE : 0)
Expand Down
2 changes: 0 additions & 2 deletions dist/6241-6241.js

This file was deleted.

1 change: 0 additions & 1 deletion dist/6241-6241.js.map

This file was deleted.

1 change: 0 additions & 1 deletion dist/6241-6241.js.map.license

This file was deleted.

2 changes: 2 additions & 0 deletions dist/9134-9134.js

Large diffs are not rendered by default.

File renamed without changes.
1 change: 1 addition & 0 deletions dist/9134-9134.js.map

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dist/9134-9134.js.map.license
4 changes: 2 additions & 2 deletions dist/files_sharing-files_sharing_tab.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/files_sharing-files_sharing_tab.js.map

Large diffs are not rendered by default.

Loading