From 7776e088d67d66f7c6394a7f7468a71cd3b58f90 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 20 Mar 2015 09:49:33 +0100 Subject: [PATCH] Group sharing activities by user/group and file respectively --- apps/files_sharing/lib/activity.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/apps/files_sharing/lib/activity.php b/apps/files_sharing/lib/activity.php index 0cd874d69f..50ec2f297d 100644 --- a/apps/files_sharing/lib/activity.php +++ b/apps/files_sharing/lib/activity.php @@ -202,6 +202,7 @@ class Activity implements IExtension { } else if ($app === 'files') { switch ($text) { case self::SUBJECT_SHARED_LINK_SELF: + return [0 => 'file']; case self::SUBJECT_SHARED_USER_SELF: case self::SUBJECT_SHARED_WITH_BY: return [0 => 'file', 1 => 'username']; @@ -225,6 +226,19 @@ class Activity implements IExtension { * @return integer|false */ public function getGroupParameter($activity) { + if ($activity['app'] === 'files') { + switch ($activity['subject']) { + case self::SUBJECT_SHARED_LINK_SELF: + case self::SUBJECT_SHARED_WITH_BY: + // Group by file name + return 0; + case self::SUBJECT_SHARED_USER_SELF: + case self::SUBJECT_SHARED_GROUP_SELF: + // Group by user/group + return 1; + } + } + return false; }