Skip to content
Snippets Groups Projects
Commit 00c9974d authored by Thomas Müller's avatar Thomas Müller
Browse files

Merge pull request #23663 from owncloud/share-displayownerfix

Fix displaying owner before share icon in file list
parents 510e8db1 a9aa39ef
No related branches found
No related tags found
No related merge requests found
...@@ -111,8 +111,9 @@ ...@@ -111,8 +111,9 @@
_.each($files, function(file) { _.each($files, function(file) {
var $tr = $(file); var $tr = $(file);
var shareTypes = $tr.attr('data-share-types'); var shareTypes = $tr.attr('data-share-types') || '';
if (shareTypes) { var shareOwner = $tr.attr('data-share-owner');
if (shareTypes || shareOwner) {
var hasLink = false; var hasLink = false;
var hasShares = false; var hasShares = false;
_.each(shareTypes.split(',') || [], function(shareType) { _.each(shareTypes.split(',') || [], function(shareType) {
......
...@@ -141,7 +141,7 @@ describe('OCA.Sharing.Util tests', function() { ...@@ -141,7 +141,7 @@ describe('OCA.Sharing.Util tests', function() {
permissions: OC.PERMISSION_ALL, permissions: OC.PERMISSION_ALL,
shareOwner: 'User One', shareOwner: 'User One',
etag: 'abc', etag: 'abc',
shareTypes: [OC.Share.SHARE_TYPE_USER] shareTypes: []
}]); }]);
$tr = fileList.$el.find('tbody tr:first'); $tr = fileList.$el.find('tbody tr:first');
$action = $tr.find('.action-share'); $action = $tr.find('.action-share');
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment