Skip to content

Fix filtering our owner & current user from shares #20825

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

Merged
skjnldsv merged 1 commit into from
May 5, 2020
Merged

Fix filtering our owner & current user from shares #20825

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
Fix filtering our owner & current user from shares 
Signed-off-by: John Molakvoæ (skjnldsv) <[email protected]>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
  • Loading branch information
@skjnldsv @npmbuildbot
skjnldsv authored and npmbuildbot[bot] committed May 5, 2020
commit edecd0931e009a9254a7b7c8209a5877f9073330
28 changes: 14 additions & 14 deletions apps/files_sharing/js/dist/files_sharing_tab.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apps/files_sharing/js/dist/files_sharing_tab.js.map
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 9 additions & 7 deletions apps/files_sharing/src/components/SharingInput.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,14 +306,16 @@ export default {
return arr
}
try {
// filter out current user
if (share.value.shareWith === getCurrentUser().uid) {
return arr
}
if (share.value.shareType === this.SHARE_TYPES.SHARE_TYPE_USER) {
// filter out current user
if (share.value.shareWith === getCurrentUser().uid) {
return arr
}

// filter out the owner of the share
if (this.reshare && share.value.shareWith === this.reshare.owner) {
return arr
// filter out the owner of the share
if (this.reshare && share.value.shareWith === this.reshare.owner) {
return arr
}
}

// filter out existing mail shares
Expand Down