diff options
| author | Julius Härtl <jus@bitgrid.net> | 2018-02-15 12:11:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-15 12:11:09 +0100 |
| commit | c300a64520b8144da789655a7122e18d7e75a751 (patch) | |
| tree | 5735721021c92386559b130a8ffc2e0e9c89986c | |
| parent | 07e91d2d62a3853fb9329123756560ba258cb970 (diff) | |
| parent | cae311460af42ba286b6e8c8dff61daf583d1bd4 (diff) | |
| download | nextcloud-server-c300a64520b8144da789655a7122e18d7e75a751.tar.gz nextcloud-server-c300a64520b8144da789655a7122e18d7e75a751.zip | |
Merge pull request #8277 from nextcloud/avatars-shared-all
Show share owner avatars on all file lists
| -rw-r--r-- | apps/files_sharing/js/share.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js index aa0803c491b..b2715912d3b 100644 --- a/apps/files_sharing/js/share.js +++ b/apps/files_sharing/js/share.js @@ -12,6 +12,7 @@ _.extend(OC.Files.Client, { PROPERTY_SHARE_TYPES: '{' + OC.Files.Client.NS_OWNCLOUD + '}share-types', + PROPERTY_OWNER_ID: '{' + OC.Files.Client.NS_OWNCLOUD + '}owner-id', PROPERTY_OWNER_DISPLAY_NAME: '{' + OC.Files.Client.NS_OWNCLOUD + '}owner-display-name' }); @@ -66,6 +67,7 @@ var fileInfo = oldElementToFile.apply(this, arguments); fileInfo.sharePermissions = $el.attr('data-share-permissions') || undefined; fileInfo.shareOwner = $el.attr('data-share-owner') || undefined; + fileInfo.shareOwnerId = $el.attr('data-share-owner-id') || undefined; if( $el.attr('data-share-types')){ fileInfo.shareTypes = $el.attr('data-share-types').split(','); @@ -83,6 +85,7 @@ var oldGetWebdavProperties = fileList._getWebdavProperties; fileList._getWebdavProperties = function() { var props = oldGetWebdavProperties.apply(this, arguments); + props.push(OC.Files.Client.PROPERTY_OWNER_ID); props.push(OC.Files.Client.PROPERTY_OWNER_DISPLAY_NAME); props.push(OC.Files.Client.PROPERTY_SHARE_TYPES); return props; @@ -95,6 +98,7 @@ if (permissionsProp && permissionsProp.indexOf('S') >= 0) { data.shareOwner = props[OC.Files.Client.PROPERTY_OWNER_DISPLAY_NAME]; + data.shareOwnerId = props[OC.Files.Client.PROPERTY_OWNER_ID]; } var shareTypesProp = props[OC.Files.Client.PROPERTY_SHARE_TYPES]; |