diff options
author | Joas Schilling <nickvergessen@gmx.de> | 2015-01-27 11:06:18 +0100 |
---|---|---|
committer | Joas Schilling <nickvergessen@gmx.de> | 2015-01-27 12:32:32 +0100 |
commit | 3f8e850dc6b3ac67c0c3a8b4d6a029b23770c789 (patch) | |
tree | fbb3ce6e0432091fa0f92764f87b5afb4fa64379 /core | |
parent | 956de27e947b9f3697411ce365595640d5620851 (diff) | |
download | nextcloud-server-3f8e850dc6b3ac67c0c3a8b4d6a029b23770c789.tar.gz nextcloud-server-3f8e850dc6b3ac67c0c3a8b4d6a029b23770c789.zip |
Indicate that the share owner is remote in the filelist
Diffstat (limited to 'core')
-rw-r--r-- | core/js/share.js | 3 | ||||
-rw-r--r-- | 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 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' ); }); |