Skip to content

Commit c300a64

Browse files
authored
Merge pull request nextcloud#8277 from nextcloud/avatars-shared-all
Show share owner avatars on all file lists
2 parents 07e91d2 + cae3114 commit c300a64

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

apps/files_sharing/js/share.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
_.extend(OC.Files.Client, {
1414
PROPERTY_SHARE_TYPES: '{' + OC.Files.Client.NS_OWNCLOUD + '}share-types',
15+
PROPERTY_OWNER_ID: '{' + OC.Files.Client.NS_OWNCLOUD + '}owner-id',
1516
PROPERTY_OWNER_DISPLAY_NAME: '{' + OC.Files.Client.NS_OWNCLOUD + '}owner-display-name'
1617
});
1718

@@ -66,6 +67,7 @@
6667
var fileInfo = oldElementToFile.apply(this, arguments);
6768
fileInfo.sharePermissions = $el.attr('data-share-permissions') || undefined;
6869
fileInfo.shareOwner = $el.attr('data-share-owner') || undefined;
70+
fileInfo.shareOwnerId = $el.attr('data-share-owner-id') || undefined;
6971

7072
if( $el.attr('data-share-types')){
7173
fileInfo.shareTypes = $el.attr('data-share-types').split(',');
@@ -83,6 +85,7 @@
8385
var oldGetWebdavProperties = fileList._getWebdavProperties;
8486
fileList._getWebdavProperties = function() {
8587
var props = oldGetWebdavProperties.apply(this, arguments);
88+
props.push(OC.Files.Client.PROPERTY_OWNER_ID);
8689
props.push(OC.Files.Client.PROPERTY_OWNER_DISPLAY_NAME);
8790
props.push(OC.Files.Client.PROPERTY_SHARE_TYPES);
8891
return props;
@@ -95,6 +98,7 @@
9598

9699
if (permissionsProp && permissionsProp.indexOf('S') >= 0) {
97100
data.shareOwner = props[OC.Files.Client.PROPERTY_OWNER_DISPLAY_NAME];
101+
data.shareOwnerId = props[OC.Files.Client.PROPERTY_OWNER_ID];
98102
}
99103

100104
var shareTypesProp = props[OC.Files.Client.PROPERTY_SHARE_TYPES];

0 commit comments

Comments
 (0)