mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Indicate that the share owner is remote in the filelist

This commit is contained in:
Joas Schilling 2015-01-27 11:06:18 +01:00
parent 956de27e94
commit 3f8e850dc6
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; tooltip += '@' + userDomain;
} }
if (server) { if (server) {
if (!userDomain) {
userDomain = '…';
}
tooltip += '@' + server; 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() { 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'
); );
}); });