summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2019-10-15 00:21:54 +0200
committerGitHub <noreply@github.com>2019-10-15 00:21:54 +0200
commit7536caaff8b9fcb4219ba679e87a91fd2b475a0f (patch)
tree1bcd66118f9b1a0b096ee9d4d79b94ecc4c9dada
parent40eb9fae74bd4c0493e14726e0e7ea57bd49adb3 (diff)
parent4d40eb61b48ae15d614172d1cb7e17a33d911348 (diff)
downloadnextcloud-server-7536caaff8b9fcb4219ba679e87a91fd2b475a0f.tar.gz
nextcloud-server-7536caaff8b9fcb4219ba679e87a91fd2b475a0f.zip
Merge pull request #17501 from nextcloud/bugfix/fad-48/list-share-downloads-under-sharing
List share download activity under sharing
-rw-r--r--apps/files_sharing/lib/Activity/Filter.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/apps/files_sharing/lib/Activity/Filter.php b/apps/files_sharing/lib/Activity/Filter.php
index ab1ad0c8145..e838ed293bf 100644
--- a/apps/files_sharing/lib/Activity/Filter.php
+++ b/apps/files_sharing/lib/Activity/Filter.php
@@ -83,7 +83,8 @@ class Filter implements IFilter {
public function filterTypes(array $types) {
return array_intersect([
self::TYPE_SHARED,
- self::TYPE_REMOTE_SHARE
+ self::TYPE_REMOTE_SHARE,
+ 'file_downloaded',
], $types);
}
@@ -92,6 +93,9 @@ class Filter implements IFilter {
* @since 11.0.0
*/
public function allowedApps() {
- return ['files_sharing'];
+ return [
+ 'files_sharing',
+ 'files_downloadactivity',
+ ];
}
}