From 3f8e850dc6b3ac67c0c3a8b4d6a029b23770c789 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 27 Jan 2015 11:06:18 +0100 Subject: [PATCH] Indicate that the share owner is remote in the filelist --- core/js/share.js | 3 +++ core/js/tests/specs/shareSpec.js | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/core/js/share.js b/core/js/share.js index 877ef4856a..b3533af482 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 f450089546..7eb22261e1 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' ); });