diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-01-28 01:06:32 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-01-28 01:06:32 +0100 |
| commit | e0b06435288484efb7661d86fcfbccdcdd5b495e (patch) | |
| tree | 80bfb93789193c9c4291c40f5f04b62cba369def | |
| parent | 752b94d3633a74e7188d86d196411796a67947a3 (diff) | |
| parent | 3f8e850dc6b3ac67c0c3a8b4d6a029b23770c789 (diff) | |
| download | nextcloud-server-e0b06435288484efb7661d86fcfbccdcdd5b495e.tar.gz nextcloud-server-e0b06435288484efb7661d86fcfbccdcdd5b495e.zip | |
Merge pull request #13704 from owncloud/issue/13571-indicate-remote-sharee-in-filelist
Indicate that the share owner is remote in the filelist
| -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' ); }); |