diff --git a/Controller/TimelinePersonController.php b/Controller/TimelinePersonController.php index 95c91df8e..ad8d46a67 100644 --- a/Controller/TimelinePersonController.php +++ b/Controller/TimelinePersonController.php @@ -42,12 +42,28 @@ class TimelinePersonController extends Controller } $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person); + + /* @var $timelineBuilder \Chill\MainBundle\Timeline\TimelineBuilder */ + $timelineBuilder = $this->get('chill.main.timeline_builder'); + $paginatorFactory = $this->get('chill_main.paginator_factory'); + + $nbItems = $timelineBuilder->countItems('person', + [ 'person' => $person ] + ); + + $paginator = $paginatorFactory->create($nbItems); return $this->render('ChillPersonBundle:Timeline:index.html.twig', array ( - 'timeline' => $this->get('chill.main.timeline_builder') - ->getTimelineHTML('person', array('person' => $person)), - 'person' => $person + 'timeline' => $timelineBuilder->getTimelineHTML( + 'person', + array('person' => $person), + $paginator->getCurrentPage()->getFirstItemNumber(), + $paginator->getItemsPerPage() + ), + 'person' => $person, + 'nb_items' => $nbItems, + 'paginator' => $paginator ) ); } diff --git a/Resources/views/Timeline/index.html.twig b/Resources/views/Timeline/index.html.twig index 0733e3174..07ec9ee66 100644 --- a/Resources/views/Timeline/index.html.twig +++ b/Resources/views/Timeline/index.html.twig @@ -29,4 +29,7 @@ This view should receive those arguments: {% block personcontent %} {{ timeline|raw }} + {% if nb_items > paginator.getItemsPerPage %} + {{ chill_pagination(paginator) }} + {% endif %} {% endblock personcontent %}