mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #20825 from nextcloud/fix/sharing-own-group

This commit is contained in:
John Molakvoæ 2020-05-05 18:06:09 +02:00 committed by GitHub
parent 09d7854d0e edecd0931e
commit 32e56dee89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
apps/files_sharing/js/dist/files_sharing_tab.js vendored
View File

File diff suppressed because one or more lines are too long

2
apps/files_sharing/js/dist/files_sharing_tab.js.map vendored
View File

File diff suppressed because one or more lines are too long

16
apps/files_sharing/src/components/SharingInput.vue
View File

@ -306,14 +306,16 @@ export default {
return arr return arr
} }
try { try {
// filter out current user if (share.value.shareType === this.SHARE_TYPES.SHARE_TYPE_USER) {
if (share.value.shareWith === getCurrentUser().uid) { // filter out current user
return arr if (share.value.shareWith === getCurrentUser().uid) {
} return arr
}
// filter out the owner of the share // filter out the owner of the share
if (this.reshare && share.value.shareWith === this.reshare.owner) { if (this.reshare && share.value.shareWith === this.reshare.owner) {
return arr return arr
}
} }
// filter out existing mail shares // filter out existing mail shares