mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Combine move activities as well 

Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2020-03-10 09:32:10 +01:00
parent 5a8c7854d6
commit 38292753ac
No known key found for this signature in database
GPG Key ID: 7076EA9751AACDDA
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/files/lib/Activity/Provider.php
View File

@ -246,7 +246,11 @@ class Provider implements IProvider {
$this->setSubjects($event, $subject, $parsedParameters); $this->setSubjects($event, $subject, $parsedParameters);
$event = $this->eventMerger->mergeEvents('file', $event, $previousEvent); if ($event->getSubject() === 'moved_self' || $event->getSubject() === 'moved_by') {
$event = $this->eventMerger->mergeEvents('oldfile', $event, $previousEvent);
} else {
$event = $this->eventMerger->mergeEvents('file', $event, $previousEvent);
}
if ($event->getChildEvent() === null) { if ($event->getChildEvent() === null) {
// Couldn't group by file, maybe we can group by user // Couldn't group by file, maybe we can group by user