upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-20 00:12:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 34

Merge pull request #30314 from nextcloud/backport/30266/stable21

Browse source
This commit is contained in:
John Molakvoæ 2021-12-21 15:09:52 +01:00 committed by GitHub
commit f31369af13
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
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

13
apps/files_sharing/src/views/SharingTab.vue
View file

@ -291,6 +291,19 @@ export default {
// interval update
this.expirationInterval = setInterval(this.updateExpirationSubtitle, 10000, share)
}
} else if (this.fileInfo && this.fileInfo.shareOwnerId !== undefined ? this.fileInfo.shareOwnerId !== OC.currentUser : false) {
// Fallback to compare owner and current user.
this.sharedWithMe = {
displayName: this.fileInfo.shareOwner,
title: t(
'files_sharing',
'Shared with you by {owner}',
{ owner: this.fileInfo.shareOwner },
undefined,
{ escape: false }
),
user: this.fileInfo.shareOwnerId,
}
}
},