From db5ea95e2932fe1ade08da2dfe40d2b5473842cd Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Thu, 31 Mar 2016 09:27:38 +0200 Subject: Add capability to show if group sharing is enabled fixes #23477 Now clients can correct wording to properly reflect who a user can share with. --- apps/files_sharing/lib/capabilities.php | 2 ++ apps/files_sharing/tests/capabilities.php | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+) (limited to 'apps') diff --git a/apps/files_sharing/lib/capabilities.php b/apps/files_sharing/lib/capabilities.php index 913f248b174..5ec540ad4e0 100644 --- a/apps/files_sharing/lib/capabilities.php +++ b/apps/files_sharing/lib/capabilities.php @@ -74,6 +74,8 @@ class Capabilities implements ICapability { $res['user']['send_mail'] = $this->config->getAppValue('core', 'shareapi_allow_mail_notification', 'no') === 'yes'; $res['resharing'] = $this->config->getAppValue('core', 'shareapi_allow_resharing', 'yes') === 'yes'; + + $res['group_sharing'] = $this->config->getAppValue('core', 'shareapi_allow_group_sharing', 'yes') === 'yes'; } //Federated sharing diff --git a/apps/files_sharing/tests/capabilities.php b/apps/files_sharing/tests/capabilities.php index 7572f5c84aa..0e17811be03 100644 --- a/apps/files_sharing/tests/capabilities.php +++ b/apps/files_sharing/tests/capabilities.php @@ -243,6 +243,24 @@ class FilesSharingCapabilitiesTest extends \Test\TestCase { $this->assertFalse($result['public']['upload']); } + public function testNoGroupSharing() { + $map = [ + ['core', 'shareapi_enabled', 'yes', 'yes'], + ['core', 'shareapi_allow_group_sharing', 'yes', 'no'], + ]; + $result = $this->getResults($map); + $this->assertFalse($result['group_sharing']); + } + + public function testGroupSharing() { + $map = [ + ['core', 'shareapi_enabled', 'yes', 'yes'], + ['core', 'shareapi_allow_group_sharing', 'yes', 'yes'], + ]; + $result = $this->getResults($map); + $this->assertTrue($result['group_sharing']); + } + public function testFederatedSharingIncomming() { $map = [ ['files_sharing', 'incoming_server2server_share_enabled', 'yes', 'yes'], -- cgit v1.2.3