Skip to content

fix: show custom permissions when share is removed from edit bundle #64202

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

Open
kristian-zendato wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −23
Open

fix: show custom permissions when share is removed from edit bundle #64202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 6 additions & 10 deletions apps/files_sharing/src/components/SharingEntryQuickShareSelect.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,7 @@ import IconPencil from 'vue-material-design-icons/PencilOutline.vue'
import IconFileUpload from 'vue-material-design-icons/TrayArrowUp.vue'
import DropdownIcon from 'vue-material-design-icons/TriangleSmallDown.vue'
import IconTune from 'vue-material-design-icons/Tune.vue'
import {
ATOMIC_PERMISSIONS,
getBundledPermissions,
} from '../lib/SharePermissionsToolBox.js'
import { getBundledPermissions } from '../lib/SharePermissionsToolBox.js'
import ShareDetails from '../mixins/ShareDetails.js'
import SharesMixin from '../mixins/SharesMixin.js'

Expand Down Expand Up @@ -98,14 +95,13 @@ export default {
},

preSelectedOption() {
// We remove the share permission for the comparison as it is not relevant for bundled permissions.
const permissionsWithoutShare = this.share.permissions & ~ATOMIC_PERMISSIONS.SHARE
const basePermissions = getBundledPermissions(true)
if (permissionsWithoutShare === basePermissions.READ_ONLY) {
const permissions = this.share.permissions
const basePermissions = this.bundledPermissions
if (permissions === basePermissions.READ_ONLY) {
return this.canViewText
} else if (permissionsWithoutShare === basePermissions.ALL || permissionsWithoutShare === basePermissions.ALL_FILE) {
} else if (permissions === basePermissions.ALL || permissions === basePermissions.ALL_FILE) {
return this.canEditText
} else if (permissionsWithoutShare === basePermissions.FILE_DROP) {
} else if (permissions === basePermissions.FILE_DROP) {
return this.fileDropText
}

Expand Down
10 changes: 3 additions & 7 deletions apps/files_sharing/src/mixins/SharesMixin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@ import { ShareType } from '@nextcloud/sharing'
import debounce from 'debounce'
import PQueue from 'p-queue'
import { fetchNode } from '../../../files/src/services/WebdavClient.ts'
import {
ATOMIC_PERMISSIONS,
getBundledPermissions,
} from '../lib/SharePermissionsToolBox.js'
import { getBundledPermissions } from '../lib/SharePermissionsToolBox.js'
import Share from '../models/Share.ts'
import Config from '../services/ConfigService.ts'
import logger from '../services/logger.ts'
Expand Down Expand Up @@ -138,15 +135,14 @@ export default {
return this.config.isDefaultInternalExpireDateEnforced
},
hasCustomPermissions() {
const basePermissions = getBundledPermissions(true)
const basePermissions = getBundledPermissions(this.config.excludeReshareFromEdit)
const bundledPermissions = [
basePermissions.ALL,
basePermissions.ALL_FILE,
basePermissions.READ_ONLY,
basePermissions.FILE_DROP,
]
const permissionsWithoutShare = this.share.permissions & ~ATOMIC_PERMISSIONS.SHARE
return !bundledPermissions.includes(permissionsWithoutShare)
return !bundledPermissions.includes(this.share.permissions)
},
maxExpirationDateEnforced() {
if (this.isExpiryDateEnforced) {
Expand Down
14 changes: 8 additions & 6 deletions apps/files_sharing/src/views/SharingDetailsTab.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1051,12 +1051,14 @@ export default {
handleDefaultPermissions() {
if (this.isNewShare) {
const defaultPermissions = this.config.defaultPermissions
const permissionsWithoutShare = defaultPermissions & ~ATOMIC_PERMISSIONS.SHARE
const basePermissions = getBundledPermissions(true)
if (permissionsWithoutShare === basePermissions.READ_ONLY
|| permissionsWithoutShare === basePermissions.ALL
|| permissionsWithoutShare === basePermissions.ALL_FILE) {
this.sharingPermission = permissionsWithoutShare.toString()
const basePermissions = this.bundledPermissions
if (defaultPermissions === basePermissions.READ_ONLY) {
this.sharingPermission = basePermissions.READ_ONLY.toString()
} else if (defaultPermissions === basePermissions.ALL
|| defaultPermissions === basePermissions.ALL_FILE) {
this.sharingPermission = this.allPermissions
} else if (defaultPermissions === basePermissions.FILE_DROP) {
this.sharingPermission = basePermissions.FILE_DROP.toString()
} else {
this.sharingPermission = 'custom'
this.share.permissions = defaultPermissions
Expand Down
Loading