monitoring: Rename $serviceStates to $services in the servicegrid view script

refs #9538
This commit is contained in:
Eric Lippmann 2015-08-21 11:35:03 +02:00
parent 1ab8fc0012
commit 71b89ea51a

View File

@ -23,7 +23,7 @@ if (count($pivotData) === 0) {
$hostFilter = '(host_name=' . implode('|host_name=', array_keys($pivotData)) . ')'; $hostFilter = '(host_name=' . implode('|host_name=', array_keys($pivotData)) . ')';
?> ?>
<table class="pivot servicestates"> <table class="pivot servicestates">
<?php foreach ($pivotData as $hostName => $serviceStates): ?> <?php foreach ($pivotData as $hostName => $services): ?>
<?php if (!$hasHeader): ?> <?php if (!$hasHeader): ?>
<thead> <thead>
<tr> <tr>
@ -35,10 +35,10 @@ $hostFilter = '(host_name=' . implode('|host_name=', array_keys($pivotData)) . '
'yAxisPaginator' => $verticalPaginator 'yAxisPaginator' => $verticalPaginator
) )
); ?></th> ); ?></th>
<th colspan="<?= count($serviceStates); ?>"> <th colspan="<?= count($services); ?>">
<div> <div>
<?php <?php
$serviceDescriptions = array_keys($serviceStates); $serviceDescriptions = array_keys($services);
$serviceFilter = '(service_description=' . implode('|service_description=', $serviceDescriptions) . ')'; $serviceFilter = '(service_description=' . implode('|service_description=', $serviceDescriptions) . ')';
foreach ($serviceDescriptions as $serviceDescription): ?> foreach ($serviceDescriptions as $serviceDescription): ?>
@ -72,7 +72,7 @@ foreach ($serviceDescriptions as $serviceDescription): ?>
array('title' => sprintf($this->translate('List all reported services on host %s'), $hostName)) array('title' => sprintf($this->translate('List all reported services on host %s'), $hostName))
); ?> ); ?>
</th> </th>
<?php foreach (array_values($serviceStates) as $service): ?> <?php foreach (array_values($services) as $service): ?>
<?php if ($service !== null): ?> <?php if ($service !== null): ?>
<td> <td>
<span class="sr-only" id="<?= $service->host_name . '_' . $service->service_description . '_desc'; ?>"> <span class="sr-only" id="<?= $service->host_name . '_' . $service->service_description . '_desc'; ?>">