Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>tags/v14.0.0beta3
@@ -124,6 +124,7 @@ class SharesPlugin extends \Sabre\DAV\ServerPlugin { | |||
\OCP\Share::SHARE_TYPE_LINK, | |||
\OCP\Share::SHARE_TYPE_REMOTE, | |||
\OCP\Share::SHARE_TYPE_EMAIL, | |||
\OCP\Share::SHARE_TYPE_ROOM, | |||
]; | |||
foreach ($requestedShareTypes as $requestedShareType) { | |||
// one of each type is enough to find out about the types |
@@ -298,6 +298,7 @@ class SharesPluginTest extends \Test\TestCase { | |||
[[\OCP\Share::SHARE_TYPE_GROUP]], | |||
[[\OCP\Share::SHARE_TYPE_LINK]], | |||
[[\OCP\Share::SHARE_TYPE_REMOTE]], | |||
[[\OCP\Share::SHARE_TYPE_ROOM]], | |||
[[\OCP\Share::SHARE_TYPE_USER, \OCP\Share::SHARE_TYPE_GROUP]], | |||
[[\OCP\Share::SHARE_TYPE_USER, \OCP\Share::SHARE_TYPE_GROUP, \OCP\Share::SHARE_TYPE_LINK]], | |||
[[\OCP\Share::SHARE_TYPE_USER, \OCP\Share::SHARE_TYPE_LINK]], |
@@ -214,7 +214,8 @@ class ApiController extends Controller { | |||
\OCP\Share::SHARE_TYPE_GROUP, | |||
\OCP\Share::SHARE_TYPE_LINK, | |||
\OCP\Share::SHARE_TYPE_REMOTE, | |||
\OCP\Share::SHARE_TYPE_EMAIL | |||
\OCP\Share::SHARE_TYPE_EMAIL, | |||
\OCP\Share::SHARE_TYPE_ROOM | |||
]; | |||
foreach ($requestedShareTypes as $requestedShareType) { | |||
// one of each type is enough to find out about the types |
@@ -144,6 +144,8 @@ | |||
hasShares = true; | |||
} else if (shareType === OC.Share.SHARE_TYPE_CIRCLE) { | |||
hasShares = true; | |||
} else if (shareType === OC.Share.SHARE_TYPE_ROOM) { | |||
hasShares = true; | |||
} | |||
}); | |||
OCA.Sharing.Util._updateFileActionIcon($tr, hasShares, hasLink); |
@@ -108,6 +108,26 @@ describe('OCA.Sharing.Util tests', function() { | |||
expect($action.find('.icon').hasClass('icon-public')).toEqual(false); | |||
expect(OC.basename(getImageUrl($tr.find('.filename .thumbnail')))).toEqual('folder-shared.svg'); | |||
}); | |||
it('shows simple share text with share icon when shared to a room', function() { | |||
var $action, $tr; | |||
fileList.setFiles([{ | |||
id: 1, | |||
type: 'dir', | |||
name: 'One', | |||
path: '/subdir', | |||
mimetype: 'text/plain', | |||
size: 12, | |||
permissions: OC.PERMISSION_ALL, | |||
etag: 'abc', | |||
shareTypes: [OC.Share.SHARE_TYPE_ROOM] | |||
}]); | |||
$tr = fileList.$el.find('tbody tr:first'); | |||
$action = $tr.find('.action-share'); | |||
expect($action.find('>span').text().trim()).toEqual('Shared'); | |||
expect($action.find('.icon').hasClass('icon-shared')).toEqual(true); | |||
expect($action.find('.icon').hasClass('icon-public')).toEqual(false); | |||
expect(OC.basename(getImageUrl($tr.find('.filename .thumbnail')))).toEqual('folder-shared.svg'); | |||
}); | |||
it('shows simple share text with public icon when shared with link', function() { | |||
var $action, $tr; | |||
OC.Share.statuses = {1: {link: true, path: '/subdir'}}; |