Commit e1e0ba49 authored by Nigel Kukard's avatar Nigel Kukard

Revert "Display conflicts icon for pool members"

This reverts commit 85b96c4e.
parent b2b6bca1
......@@ -199,23 +199,23 @@ EOF
my $trafficClass = getTrafficClass($pool->{'TrafficClassID'});
my $trafficClassNameEncoded = encode_entities($trafficClass->{'Name'});
my $poolShaperState = getPoolShaperState($pool->{'ID'});
my $poolMemberShaperState = getPoolMemberShaperState($pool->{'ID'});
# Display relevant icons depending on pool status
my $icons = "";
if (!($poolShaperState & SHAPER_NOTLIVE) || $pool->{'Status'} == CFGM_CHANGED) {
if (getPoolShaperState($pool->{'ID'}) & SHAPER_NOTLIVE || $pool->{'Status'} == CFGM_CHANGED) {
$icons .= '<span class="glyphicon glyphicon-time" />';
}
if ($poolMemberShaperState & SHAPER_CONFLICT) {
$icons .= '<span class="glyphicon glyphicon-random" />';
}
if ($pool->{'Status'} == CFGM_NEW) {
$icons .= '<span class="glyphicon glyphicon-import" />';
}
if ($pool->{'Status'} == CFGM_OFFLINE) {
$icons .= '<span class="glyphicon glyphicon-trash" />';
}
# if ($pool->{'Status'} eq 'conflict') {
# $icons .= '<span class="glyphicon glyphicon-random" />';
# }
# if ($pool->{'Status'} eq 'conflict') {
# $icons .= '<span class="glyphicon glyphicon-edit" />';
# }
my $urlStatsPool = sprintf('/statistics/by-pool?pool=%s',uri_escape("$pool->{'InterfaceGroupID'}:$pool->{'Name'}"));
my $urlPoolEdit = sprintf('/limits/pool-edit?pid=%s',uri_escape($pool->{'ID'}));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment