show/contact: Ensure dashboard compliance

refs #7876
Icinga · Apr 17, 2015 · 3f092ff · 3f092ff
1 parent 9388944
commit 3f092ff
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/modules/monitoring/application/controllers/ShowController.php b/modules/monitoring/application/controllers/ShowController.php
@@ -145,9 +145,7 @@ public function contactAction()
             'contact_notify_host_flapping',
             'contact_notify_host_downtime',
         ));
-
         $query->where('contact_name', $contactName);
-
         $contact = $query->getQuery()->fetchRow();
 
         if ($contact) {
@@ -171,6 +169,8 @@ public function contactAction()
 
             $notifications->where('contact_object_id', $contact->contact_object_id);
             $this->view->notifications = $notifications->paginate();
+            $this->setupLimitControl();
+            $this->setupPaginationControl($this->view->notifications);
         }
 
         $this->view->contact = $contact;

diff --git a/modules/monitoring/application/views/scripts/show/contact.phtml b/modules/monitoring/application/views/scripts/show/contact.phtml
@@ -1,6 +1,8 @@
 <?php $contactHelper = $this->getHelper('ContactFlags') ?>
 <div class="controls">
-  <?= $this->tabs ?>
+ <?php if (! $this->compact): ?>
+  <?= $this->tabs; ?>
+ <?php endif ?>
   <h1><?= $this->translate('Contact details') ?></h1>
   <div class="circular" style="background-image: url('<?=
       $this->href('static/gravatar', array('email' => $contact->contact_email))
@@ -54,6 +56,8 @@
   </ul>
   <?php endif ?>
   <h1><?= $this->translate('Notifications sent to this contact') ?></h1>
+  <?= $this->limiter; ?>
+  <?= $this->paginator; ?>
 </div>
 
 <?php if (count($notifications)): ?>