Fix displaying owner before share icon in file list

Initial display of owner was missing
This commit is contained in:
Vincent Petry 2016-03-30 18:09:02 +02:00
parent 66ee9d56fc
commit a9aa39efbf
2 changed files with 4 additions and 3 deletions

View File

@ -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) {

View File

@ -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');