Fixed display of overridden pool icon in list

opentrafficshaper/plugins/configmanager.pm

@@ -93,6 +93,7 @@ our (@ISA,@EXPORT,@EXPORT_OK);
 	setPoolShaperState
 	unsetPoolShaperState
 	isPoolIDValid
+	isPoolOverridden
 	isPoolReady
 
 	getEffectivePool
@@ -2805,6 +2806,26 @@ sub isPoolReady
 
 
 
+# Function to check if pool is being overridden or not
+sub isPoolOverridden
+{
+	my $pid = shift;
+
+
+	if (!isPoolIDValid($pid)) {
+		return;
+	}
+
+	# Set a property based on if this pool is overridden or not
+	if (defined($globals->{'Pools'}->{$pid}->{'.applied_overrides'}) &&
+			(keys %{$globals->{'Pools'}->{$pid}->{'.applied_overrides'}}) > 0) {
+		return 1;
+	}
+
+	return 0;
+}
+
+
 # Function to return a pool with any items changed as per pool overrides
 sub getEffectivePool
 {

opentrafficshaper/plugins/webserver/pages/limits.pm

@@ -59,6 +59,7 @@ use opentrafficshaper::plugins::configmanager qw(
 	getPool
 	getPoolByName
 	getPoolShaperState
+	isPoolOverridden
 	isPoolReady
 
 	getPoolMembers
@@ -213,9 +214,9 @@ EOF
 #		if ($pool->{'Status'} eq 'conflict') {
 #			$icons .= '<span class="glyphicon glyphicon-random" />';
 #		}
-#		if ($pool->{'Status'} eq 'conflict') {
-#			$icons .= '<span class="glyphicon glyphicon-edit" />';
-#		}
+		if (isPoolOverridden($pool->{'ID'})) {
+			$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'}));