diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2016-03-30 18:42:25 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2016-03-30 18:42:25 +0200 |
| commit | 00c9974d945f7d50d7d10d7de5fc5a16f4d7421e (patch) | |
| tree | 1193b760a184ea26a4681ec771a4e406020a191c /apps | |
| parent | 510e8db1ba4dfe3b6454d7a8d6dea3168a8b93c5 (diff) | |
| parent | a9aa39efbfc676aa7988a02c336adc4ef5b3b7e8 (diff) | |
| download | nextcloud-server-00c9974d945f7d50d7d10d7de5fc5a16f4d7421e.tar.gz nextcloud-server-00c9974d945f7d50d7d10d7de5fc5a16f4d7421e.zip | |
Merge pull request #23663 from owncloud/share-displayownerfix
Fix displaying owner before share icon in file list
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files_sharing/js/share.js | 5 | ||||
| -rw-r--r-- | apps/files_sharing/tests/js/shareSpec.js | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js index a253763389c..5bfc8e1d4a2 100644 --- a/apps/files_sharing/js/share.js +++ b/apps/files_sharing/js/share.js @@ -111,8 +111,9 @@ _.each($files, function(file) { var $tr = $(file); - var shareTypes = $tr.attr('data-share-types'); - if (shareTypes) { + var shareTypes = $tr.attr('data-share-types') || ''; + var shareOwner = $tr.attr('data-share-owner'); + if (shareTypes || shareOwner) { var hasLink = false; var hasShares = false; _.each(shareTypes.split(',') || [], function(shareType) { diff --git a/apps/files_sharing/tests/js/shareSpec.js b/apps/files_sharing/tests/js/shareSpec.js index c488bd94fab..c34234bfe13 100644 --- a/apps/files_sharing/tests/js/shareSpec.js +++ b/apps/files_sharing/tests/js/shareSpec.js @@ -141,7 +141,7 @@ describe('OCA.Sharing.Util tests', function() { permissions: OC.PERMISSION_ALL, shareOwner: 'User One', etag: 'abc', - shareTypes: [OC.Share.SHARE_TYPE_USER] + shareTypes: [] }]); $tr = fileList.$el.find('tbody tr:first'); $action = $tr.find('.action-share'); |