Merge pull request #23549 from owncloud/dav-sharetypes-remote
Return remote shares in oc:share-types Webdav property
This commit is contained in:
commit
ab0db65b23
|
@ -116,7 +116,8 @@ class SharesPlugin extends \Sabre\DAV\ServerPlugin {
|
||||||
$requestedShareTypes = [
|
$requestedShareTypes = [
|
||||||
\OCP\Share::SHARE_TYPE_USER,
|
\OCP\Share::SHARE_TYPE_USER,
|
||||||
\OCP\Share::SHARE_TYPE_GROUP,
|
\OCP\Share::SHARE_TYPE_GROUP,
|
||||||
\OCP\Share::SHARE_TYPE_LINK
|
\OCP\Share::SHARE_TYPE_LINK,
|
||||||
|
\OCP\Share::SHARE_TYPE_REMOTE
|
||||||
];
|
];
|
||||||
foreach ($requestedShareTypes as $requestedShareType) {
|
foreach ($requestedShareTypes as $requestedShareType) {
|
||||||
// one of each type is enough to find out about the types
|
// one of each type is enough to find out about the types
|
||||||
|
|
|
@ -248,10 +248,12 @@ class SharesPlugin extends \Test\TestCase {
|
||||||
[[\OCP\Share::SHARE_TYPE_USER]],
|
[[\OCP\Share::SHARE_TYPE_USER]],
|
||||||
[[\OCP\Share::SHARE_TYPE_GROUP]],
|
[[\OCP\Share::SHARE_TYPE_GROUP]],
|
||||||
[[\OCP\Share::SHARE_TYPE_LINK]],
|
[[\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_USER, \OCP\Share::SHARE_TYPE_GROUP, \OCP\Share::SHARE_TYPE_LINK]],
|
[[\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_USER, \OCP\Share::SHARE_TYPE_LINK]],
|
||||||
[[\OCP\Share::SHARE_TYPE_GROUP, \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]],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -177,7 +177,8 @@ class ApiController extends Controller {
|
||||||
$requestedShareTypes = [
|
$requestedShareTypes = [
|
||||||
\OCP\Share::SHARE_TYPE_USER,
|
\OCP\Share::SHARE_TYPE_USER,
|
||||||
\OCP\Share::SHARE_TYPE_GROUP,
|
\OCP\Share::SHARE_TYPE_GROUP,
|
||||||
\OCP\Share::SHARE_TYPE_LINK
|
\OCP\Share::SHARE_TYPE_LINK,
|
||||||
|
\OCP\Share::SHARE_TYPE_REMOTE
|
||||||
];
|
];
|
||||||
foreach ($requestedShareTypes as $requestedShareType) {
|
foreach ($requestedShareTypes as $requestedShareType) {
|
||||||
// one of each type is enough to find out about the types
|
// one of each type is enough to find out about the types
|
||||||
|
|
|
@ -123,6 +123,8 @@
|
||||||
hasShares = true;
|
hasShares = true;
|
||||||
} else if (shareType === OC.Share.SHARE_TYPE_GROUP) {
|
} else if (shareType === OC.Share.SHARE_TYPE_GROUP) {
|
||||||
hasShares = true;
|
hasShares = true;
|
||||||
|
} else if (shareType === OC.Share.SHARE_TYPE_REMOTE) {
|
||||||
|
hasShares = true;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
OCA.Sharing.Util._updateFileActionIcon($tr, hasShares, hasLink);
|
OCA.Sharing.Util._updateFileActionIcon($tr, hasShares, hasLink);
|
||||||
|
|
Loading…
Reference in New Issue