upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-07 15:53:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

fix(files_sharing): Create passwords when enforced for mail shares

Browse source 
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
This commit is contained in:
Ferdinand Thiessen 2024-03-29 15:30:39 +01:00
parent 7a4e0c0cc0
commit 2c2a269042
No known key found for this signature in database
GPG key ID: 45FAE7268762B400
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/files_sharing/src/models/Share.js
View file

@ -43,11 +43,11 @@ export default class Share {
ocsData.hide_download = !!ocsData.hide_download
ocsData.mail_send = !!ocsData.mail_send
if (ocsData.attributes) {
if (ocsData.attributes && typeof ocsData.attributes === 'string') {
try {
ocsData.attributes = JSON.parse(ocsData.attributes)
} catch (e) {
console.warn('Could not parse share attributes returned by server: "' + ocsData.attributes + '"')
console.warn('Could not parse share attributes returned by server', ocsData.attributes)
}
}
ocsData.attributes = ocsData.attributes ?? []
@ -310,7 +310,7 @@ export default class Share {
* @memberof Share
*/
get label() {
return this._share.label
return this._share.label ?? ''
}
/**

11
apps/files_sharing/src/views/SharingDetailsTab.vue
View file

@ -509,7 +509,7 @@ export default {
return this.share.type === this.SHARE_TYPES.SHARE_TYPE_GROUP
},
isNewShare() {
return this.share.id === null || this.share.id === undefined
return !this.share.id
},
allowsFileDrop() {
if (this.isFolder && this.config.isPublicUploadEnabled) {
@ -788,13 +788,10 @@ export default {
},
handleShareType() {
if (this.share.share_type) {
this.share.type = this.share.share_type
}
// shareType 0 (USER_SHARE) would evaluate to zero
// Hence the use of hasOwnProperty
if ('shareType' in this.share) {
this.share.type = this.share.shareType
} else if (this.share.share_type) {
this.share.type = this.share.share_type
}
},
handleDefaultPermissions() {
@ -815,7 +812,7 @@ export default {
this.sharingPermission = 'custom'
this.advancedSectionAccordionExpanded = true
this.setCustomPermissions = true
} else {
} else if (this.share.permissions) {
this.sharingPermission = this.share.permissions.toString()
}
},