Merge pull request #2175 from laf/issue-2174

Removed ping + performance graphs and tab if skip ping check
This commit is contained in:
Mike Rostermund
2015-10-21 00:14:29 +02:00
5 changed files with 47 additions and 24 deletions

View File

@@ -353,11 +353,13 @@ if (device_permitted($vars['device']) || $check_device == $vars['device']) {
</li>';
}
echo '<li class="'.$select['performance'].'">
<a href="'.generate_device_url($device, array('tab' => 'performance')).'">
<img src="images/16/chart_line.png" align="absmiddle" border="0" /> Performance
</a>
</li>';
if (can_ping_device($attribs) === true) {
echo '<li class="'.$select['performance'].'">
<a href="'.generate_device_url($device, array('tab' => 'performance')).'">
<img src="images/16/chart_line.png" align="absmiddle" border="0" /> Performance
</a>
</li>';
}
echo '<li class="'.$select['notes'].'">
<a href="'.generate_device_url($device, array('tab' => 'notes')).'">

View File

@@ -24,7 +24,9 @@ foreach (dbFetchRows('SELECT * FROM device_graphs WHERE device_id = ? ORDER BY g
// These are standard graphs we should have for all systems
$graph_enable['poller']['poller_perf'] = 'device_poller_perf';
$graph_enable['poller']['ping_perf'] = 'device_ping_perf';
if (can_ping_device($attribs) === true) {
$graph_enable['poller']['ping_perf'] = 'device_ping_perf';
}
$sep = '';
foreach ($graph_enable as $section => $nothing) {