From: Joas Schilling Date: Tue, 27 Jan 2015 10:06:18 +0000 (+0100) Subject: Indicate that the share owner is remote in the filelist X-Git-Tag: v8.0.0RC1~20^2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3f8e850dc6b3ac67c0c3a8b4d6a029b23770c789;p=nextcloud-server.git Indicate that the share owner is remote in the filelist --- diff --git a/core/js/share.js b/core/js/share.js index 877ef4856a3..b3533af4824 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -203,6 +203,9 @@ OC.Share={ tooltip += '@' + userDomain; } if (server) { + if (!userDomain) { + userDomain = '…'; + } tooltip += '@' + server; } diff --git a/core/js/tests/specs/shareSpec.js b/core/js/tests/specs/shareSpec.js index f4500895464..7eb22261e10 100644 --- a/core/js/tests/specs/shareSpec.js +++ b/core/js/tests/specs/shareSpec.js @@ -702,17 +702,17 @@ describe('OC.Share tests', function() { it('displays the user name part of a remote share owner', function() { checkOwner( 'User One@someserver.com', - 'User One', + 'User One@…', 'User One@someserver.com' ); checkOwner( 'User One@someserver.com/', - 'User One', + 'User One@…', 'User One@someserver.com' ); checkOwner( 'User One@someserver.com/root/of/owncloud', - 'User One', + 'User One@…', 'User One@someserver.com' ); });