diff options
author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2016-08-15 15:38:35 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-15 15:38:35 +0200 |
commit | 396678c9ce98c901384c827e3a45173cf6c8c5bb (patch) | |
tree | ccccc5a24acae6ac85c2dfb1337fffe55406be6d /apps/files_sharing | |
parent | f3124b5052c0fd8647f816a91b6d250c2570279c (diff) | |
parent | 9daf41e05a6e78a112aa6d5b0a8b20289c3c0a61 (diff) | |
download | nextcloud-server-396678c9ce98c901384c827e3a45173cf6c8c5bb.tar.gz nextcloud-server-396678c9ce98c901384c827e3a45173cf6c8c5bb.zip |
Merge pull request #855 from nextcloud/files_drop_capability
Add files drop capability for clients
Diffstat (limited to 'apps/files_sharing')
-rw-r--r-- | apps/files_sharing/lib/Capabilities.php | 1 | ||||
-rw-r--r-- | apps/files_sharing/tests/CapabilitiesTest.php | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/apps/files_sharing/lib/Capabilities.php b/apps/files_sharing/lib/Capabilities.php index 8dde2dafb0d..9da6dbbc995 100644 --- a/apps/files_sharing/lib/Capabilities.php +++ b/apps/files_sharing/lib/Capabilities.php @@ -69,6 +69,7 @@ class Capabilities implements ICapability { $public['send_mail'] = $this->config->getAppValue('core', 'shareapi_allow_public_notification', 'no') === 'yes'; $public['upload'] = $this->config->getAppValue('core', 'shareapi_allow_public_upload', 'yes') === 'yes'; + $public['upload_files_drop'] = $public['upload']; } $res["public"] = $public; diff --git a/apps/files_sharing/tests/CapabilitiesTest.php b/apps/files_sharing/tests/CapabilitiesTest.php index 0c4a68b997c..254f7cdaa7c 100644 --- a/apps/files_sharing/tests/CapabilitiesTest.php +++ b/apps/files_sharing/tests/CapabilitiesTest.php @@ -232,6 +232,7 @@ class CapabilitiesTest extends \Test\TestCase { ]; $result = $this->getResults($map); $this->assertTrue($result['public']['upload']); + $this->assertTrue($result['public']['upload_files_drop']); } public function testLinkNoPublicUpload() { @@ -242,6 +243,7 @@ class CapabilitiesTest extends \Test\TestCase { ]; $result = $this->getResults($map); $this->assertFalse($result['public']['upload']); + $this->assertFalse($result['public']['upload_files_drop']); } public function testNoGroupSharing() { |