Commit 3f8e850d authored by Joas Schilling's avatar Joas Schilling
Browse files

Indicate that the share owner is remote in the filelist

parent 956de27e
...@@ -203,6 +203,9 @@ OC.Share={ ...@@ -203,6 +203,9 @@ OC.Share={
tooltip += '@' + userDomain; tooltip += '@' + userDomain;
} }
if (server) { if (server) {
if (!userDomain) {
userDomain = '';
}
tooltip += '@' + server; tooltip += '@' + server;
} }
......
...@@ -702,17 +702,17 @@ describe('OC.Share tests', function() { ...@@ -702,17 +702,17 @@ describe('OC.Share tests', function() {
it('displays the user name part of a remote share owner', function() { it('displays the user name part of a remote share owner', function() {
checkOwner( checkOwner(
'User One@someserver.com', 'User One@someserver.com',
'User One', 'User One@…',
'User One@someserver.com' 'User One@someserver.com'
); );
checkOwner( checkOwner(
'User One@someserver.com/', 'User One@someserver.com/',
'User One', 'User One@…',
'User One@someserver.com' 'User One@someserver.com'
); );
checkOwner( checkOwner(
'User One@someserver.com/root/of/owncloud', 'User One@someserver.com/root/of/owncloud',
'User One', 'User One@…',
'User One@someserver.com' 'User One@someserver.com'
); );
}); });
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment