Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/DEV-capside/release-3.9.0:6365-6370
/branches/DEV-extra-notification-data:6734-6746
/branches/DEV-odw-calculations:9016-9160
/branches/DEV-snmp-multi:7324-7376
/branches/US187:9403-9479
/branches/US198b:8875-8994
/branches/enterprise/BRAN-3.14:6874,6882,6956
/branches/enterprise/DEV-professional:6494-8475,8477-8478,8486,8490,8492,8494,8499-8500,8515,8518-8519,8524,8527-8529,8531-8532,8536,8538,8540-8544,8547-8552,8554,8557,8600-8601,8637,8749,8772,8897,8917,8944-8945,8947,8950-8952,8967,8969,8979,8982,8987,8998,9006,9008,9011,9013,9026,9033-9036,9038,9040,9042,9044,9048,9050-9053,9062,9064-9065,9069,9078,9081,9088,9096,9099-9101,9103,9105,9115,9118,9347,9353-9354,9411,9432,9445,9486,9538-9550,9569-9571,9620,9635,9637-9638,9645-9647
/branches/us168:8759,8762-8763,8766-8768,8770,8774-8777,8794,8798-8799,8801-8803,8821-8822,8834,8837-8838,8932,8937,8947,8969,8977,8981,9004,9007,9009-9010,9012,9024,9049
+ /branches/DEV-capside/release-3.9.0:6365-6370
/branches/DEV-extra-notification-data:6734-6746
/branches/DEV-odw-calculations:9016-9160
/branches/DEV-snmp-multi:7324-7376
/branches/US187:9403-9479
/branches/US198b:8875-8994
/branches/enterprise/BRAN-3.14:6874,6882,6956
/branches/enterprise/DEV-professional:6494-8475,8477-8478,8486,8490,8492,8494,8499-8500,8515,8518-8519,8524,8527-8529,8531-8532,8536,8538,8540-8544,8547-8552,8554,8557,8600-8601,8637,8749,8772,8897,8917,8944-8945,8947,8950-8952,8967,8969,8979,8982,8987,8998,9006,9008,9011,9013,9026,9033-9036,9038,9040,9042,9044,9048,9050-9053,9062,9064-9065,9069,9078,9081,9088,9096,9099-9101,9103,9105,9115,9118,9347,9353-9354,9411,9432,9445,9486,9538-9550,9569-9571,9620,9635,9637-9638,9645-9647
/branches/us168:8759,8762-8763,8766-8768,8770,8774-8777,8794,8798-8799,8801-8803,8821-8822,8834,8837-8838,8932,8937,8947,8969,8977,8981,9004,9007,9009-9010,9012,9024,9049
/commercial/branches/US307-network-map:9691
Modified: trunk/opsview-core/lib/Runtime/ResultSet.pm
===================================================================
--- trunk/opsview-core/lib/Runtime/ResultSet.pm 2012-08-03 10:50:53 UTC (rev 9691)
+++ trunk/opsview-core/lib/Runtime/ResultSet.pm 2012-08-03 10:52:51 UTC (rev 9692)
@@ -213,7 +213,7 @@
}
elsif ( $filters->{summarizeon} eq "keyword" ) {
$group_key = $group_label = "keyword_name";
- @extra_group_fields = qw(description);
+ @extra_group_fields = qw(description exclude_handled);
}
my $last_group_label = "";
my $last_group_key = "";
Modified: trunk/opsview-web/root/viewportsummary/list
===================================================================
--- trunk/opsview-web/root/viewportsummary/list 2012-08-03 10:50:53 UTC (rev 9691)
+++ trunk/opsview-web/root/viewportsummary/list 2012-08-03 10:52:51 UTC (rev 9692)
@@ -24,13 +24,15 @@
%]
<td class="centered [% extra_classes.join(" ") %]">
<div class="shield">
- [% IF highest_state != "ok" -%]
+ [% IF highest_state != "ok" || ( keyword.exclude_handled && highest_state == "ok" ) -%]
[% IF allhandled %]
<div class="handledbadge" title="[% c.loc("ui.viewport.label.allProblemsHandled") | html %]"></div>
[% END %]
+ [% IF highest_state != "ok" %]
<a href="" c.uri_for("/viewport", keyword.name, { state => [1, 2, 3] }).path_query | html %]"
alt="[% c.loc("ui.viewport.summary.help.showErrors") | html %]"
title="[% c.loc("ui.viewport.summary.help.showErrors") | html %]">
+ [% END %]
[% END %]
[% c.loc("ui.status.label.$highest_state") | html %]
[% IF highest_state != "ok" %]</a>[% END %]
