webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-07-31 15:24:31 +03:00
Code Activity

Added initial settings interface, Fixes #9.

Browse Source
This commit is contained in:
Dan Brown
2015-08-30 15:31:16 +01:00
parent 8af012bc2a
commit 17f4aa4300
17 changed files with 275 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/Services/ActivityService.php
View File

@ -81,11 +81,13 @@ class ActivityService
* Gets the latest activity.
* @param int $count
* @param int $page
* @return array
*/
public function latest($count = 20, $page = 0)
{
return $this->activity->orderBy('created_at', 'desc')
$activityList = $this->activity->orderBy('created_at', 'desc')
->skip($count * $page)->take($count)->get();
return $this->filterSimilar($activityList);
}
/**
@ -99,7 +101,7 @@ class ActivityService
function entityActivity($entity, $count = 20, $page = 0)
{
$activity = $entity->hasMany('Oxbow\Activity')->orderBy('created_at', 'desc')
->skip($count*$page)->take($count)->get();
->skip($count * $page)->take($count)->get();
return $this->filterSimilar($activity);
}
@ -109,16 +111,17 @@ class ActivityService
* @param Activity[] $activity
* @return array
*/
protected function filterSimilar($activity) {
protected function filterSimilar($activity)
{
$newActivity = [];
$previousItem = false;
foreach($activity as $activityItem) {
if($previousItem === false) {
foreach ($activity as $activityItem) {
if ($previousItem === false) {
$previousItem = $activityItem;
$newActivity[] = $activityItem;
continue;
}
if(!$activityItem->isSimilarTo($previousItem)) {
if (!$activityItem->isSimilarTo($previousItem)) {
$newActivity[] = $activityItem;
}
$previousItem = $activityItem;