tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-21 12:54:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Set the view property `compact' exactly once

Browse Source 
refs #7876
This commit is contained in:
Johannes Meyer 2015-04-15 15:33:00 +02:00
parent 32e8b606b4
commit 675d070b86
5 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
library/Icinga/Web/Controller/ActionController.php
View File

@ -87,6 +87,7 @@ class ActionController extends Zend_Controller_Action
$this->_helper->layout()->isIframe = $request->getUrl()->shift('isIframe'); $this->_helper->layout()->isIframe = $request->getUrl()->shift('isIframe');
$this->_helper->layout()->moduleName = false; $this->_helper->layout()->moduleName = false;
$this->view->compact = $request->getParam('view') === 'compact';
if ($this->rerenderLayout = $request->getUrl()->shift('renderLayout')) { if ($this->rerenderLayout = $request->getUrl()->shift('renderLayout')) {
$this->xhrLayout = 'body'; $this->xhrLayout = 'body';
} }

5
modules/monitoring/application/controllers/ChartController.php
View File

@ -16,11 +16,6 @@ use Icinga\Chart\Unit\LinearUnit;
class Monitoring_ChartController extends Controller class Monitoring_ChartController extends Controller
{ {
public function init()
{
$this->view->compact = $this->_request->getParam('view') === 'compact';
}
private function drawLogChart1() private function drawLogChart1()
{ {
$chart = new GridChart(); $chart = new GridChart();

1
modules/monitoring/application/controllers/ListController.php
View File

@ -21,7 +21,6 @@ class Monitoring_ListController extends Controller
public function init() public function init()
{ {
$this->createTabs(); $this->createTabs();
$this->view->compact = $this->_request->getParam('view') === 'compact';
} }
/** /**

2
modules/monitoring/application/controllers/ShowController.php
View File

@ -167,8 +167,6 @@ class Monitoring_ShowController extends Controller
)); ));
$notifications->where('contact_object_id', $contact->contact_object_id); $notifications->where('contact_object_id', $contact->contact_object_id);
$this->view->compact = true;
$this->view->notifications = $notifications->paginate(); $this->view->notifications = $notifications->paginate();
} }

5
modules/monitoring/application/views/scripts/show/contact.phtml
View File

@ -57,7 +57,10 @@
</div> </div>
<?php if (count($notifications)): ?> <?php if (count($notifications)): ?>
<?= $this->render('list/notifications.phtml') ?> <?= $this->partial('list/notifications.phtml', array(
'notifications' => $notifications,
'compact' => true
)); ?>
<?php else: ?> <?php else: ?>
<div class="content"><?= $this->translate('No notifications have been sent for this contact') ?></div> <div class="content"><?= $this->translate('No notifications have been sent for this contact') ?></div>
<?php endif ?> <?php endif ?>