wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #13704 from owncloud/issue/13571-indicate-remote-sharee-in-filelist

Browse source 
Indicate that the share owner is remote in the filelist
This commit is contained in:
Morris Jobke 2015-01-28 01:06:32 +01:00
commit e0b0643528
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/js/share.js
View file

@ -203,6 +203,9 @@ OC.Share={
tooltip += '@' + userDomain;
}
if (server) {
if (!userDomain) {
userDomain = '…';
}
tooltip += '@' + server;
}

6
core/js/tests/specs/shareSpec.js
View file

@ -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'
);
});