diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2016-03-24 22:44:19 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2016-03-24 22:44:19 +0100 |
| commit | ab0db65b23fb381a446d5cbb0fe101c76a07cb19 (patch) | |
| tree | cfb95c81341dc9bac8467f3e62ead5f0418cf081 | |
| parent | b966fc2233b387f8034cafc61a920282e1f6a3b1 (diff) | |
| parent | 9ee1f506f210864c57f559d46f1bd4790f5c6f9e (diff) | |
| download | nextcloud-server-ab0db65b23fb381a446d5cbb0fe101c76a07cb19.tar.gz nextcloud-server-ab0db65b23fb381a446d5cbb0fe101c76a07cb19.zip | |
Merge pull request #23549 from owncloud/dav-sharetypes-remote
Return remote shares in oc:share-types Webdav property
| -rw-r--r-- | apps/dav/lib/connector/sabre/sharesplugin.php | 3 | ||||
| -rw-r--r-- | apps/dav/tests/unit/connector/sabre/sharesplugin.php | 2 | ||||
| -rw-r--r-- | apps/files/controller/apicontroller.php | 3 | ||||
| -rw-r--r-- | apps/files_sharing/js/share.js | 2 |
4 files changed, 8 insertions, 2 deletions
diff --git a/apps/dav/lib/connector/sabre/sharesplugin.php b/apps/dav/lib/connector/sabre/sharesplugin.php index f75c1378718..c76068969e9 100644 --- a/apps/dav/lib/connector/sabre/sharesplugin.php +++ b/apps/dav/lib/connector/sabre/sharesplugin.php @@ -116,7 +116,8 @@ class SharesPlugin extends \Sabre\DAV\ServerPlugin { $requestedShareTypes = [ \OCP\Share::SHARE_TYPE_USER, \OCP\Share::SHARE_TYPE_GROUP, - \OCP\Share::SHARE_TYPE_LINK + \OCP\Share::SHARE_TYPE_LINK, + \OCP\Share::SHARE_TYPE_REMOTE ]; foreach ($requestedShareTypes as $requestedShareType) { // one of each type is enough to find out about the types diff --git a/apps/dav/tests/unit/connector/sabre/sharesplugin.php b/apps/dav/tests/unit/connector/sabre/sharesplugin.php index 9a1c6eec507..42f1b539916 100644 --- a/apps/dav/tests/unit/connector/sabre/sharesplugin.php +++ b/apps/dav/tests/unit/connector/sabre/sharesplugin.php @@ -248,10 +248,12 @@ class SharesPlugin extends \Test\TestCase { [[\OCP\Share::SHARE_TYPE_USER]], [[\OCP\Share::SHARE_TYPE_GROUP]], [[\OCP\Share::SHARE_TYPE_LINK]], + [[\OCP\Share::SHARE_TYPE_REMOTE]], [[\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]], [[\OCP\Share::SHARE_TYPE_GROUP, \OCP\Share::SHARE_TYPE_LINK]], + [[\OCP\Share::SHARE_TYPE_USER, \OCP\Share::SHARE_TYPE_REMOTE]], ]; } } diff --git a/apps/files/controller/apicontroller.php b/apps/files/controller/apicontroller.php index 43abf2ff458..ad286284386 100644 --- a/apps/files/controller/apicontroller.php +++ b/apps/files/controller/apicontroller.php @@ -177,7 +177,8 @@ class ApiController extends Controller { $requestedShareTypes = [ \OCP\Share::SHARE_TYPE_USER, \OCP\Share::SHARE_TYPE_GROUP, - \OCP\Share::SHARE_TYPE_LINK + \OCP\Share::SHARE_TYPE_LINK, + \OCP\Share::SHARE_TYPE_REMOTE ]; foreach ($requestedShareTypes as $requestedShareType) { // one of each type is enough to find out about the types diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js index 5ec7824758f..a253763389c 100644 --- a/apps/files_sharing/js/share.js +++ b/apps/files_sharing/js/share.js @@ -123,6 +123,8 @@ hasShares = true; } else if (shareType === OC.Share.SHARE_TYPE_GROUP) { hasShares = true; + } else if (shareType === OC.Share.SHARE_TYPE_REMOTE) { + hasShares = true; } }); OCA.Sharing.Util._updateFileActionIcon($tr, hasShares, hasLink); |