Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
die_coolen_jungs
our_own_cloud_project
Commits
ab0db65b
Commit
ab0db65b
authored
Mar 24, 2016
by
Thomas Müller
Browse files
Merge pull request #23549 from owncloud/dav-sharetypes-remote
Return remote shares in oc:share-types Webdav property
parents
b966fc22
9ee1f506
Changes
4
Hide whitespace changes
Inline
Side-by-side
apps/dav/lib/connector/sabre/sharesplugin.php
View file @
ab0db65b
...
...
@@ -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
...
...
apps/dav/tests/unit/connector/sabre/sharesplugin.php
View file @
ab0db65b
...
...
@@ -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
]],
];
}
}
apps/files/controller/apicontroller.php
View file @
ab0db65b
...
...
@@ -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
...
...
apps/files_sharing/js/share.js
View file @
ab0db65b
...
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment