modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NewConditionEditor.java
| 12 ++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
New commits:
commit b352ab20a4e0deb0d9eccf1d492de2917d2098c2
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Mon Jun 25 15:16:12 2012 +0200
[BZ 815321 - Platform alert conditions for availability (Goes Disabled and Goes
Unknown ) should be removed] Options have been reomved when adding alert condition for
resource of type platform
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NewConditionEditor.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NewConditionEditor.java
index 61e2f21..c9785b8 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NewConditionEditor.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NewConditionEditor.java
@@ -57,6 +57,7 @@ import org.rhq.core.domain.measurement.MeasurementUnits;
import org.rhq.core.domain.measurement.NumericType;
import org.rhq.core.domain.operation.OperationDefinition;
import org.rhq.core.domain.operation.OperationRequestStatus;
+import org.rhq.core.domain.resource.ResourceCategory;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.components.form.DurationItem;
@@ -786,10 +787,13 @@ public class NewConditionEditor extends LocatableDynamicForm {
LinkedHashMap<String, String> avails = new LinkedHashMap<String,
String>(2);
avails.put(AlertConditionOperator.AVAIL_GOES_DOWN.name(),
MSG.view_alert_definition_condition_editor_operator_availability_goesDown());
- avails.put(AlertConditionOperator.AVAIL_GOES_DISABLED.name(),
-
MSG.view_alert_definition_condition_editor_operator_availability_goesDisabled());
- avails.put(AlertConditionOperator.AVAIL_GOES_UNKNOWN.name(),
-
MSG.view_alert_definition_condition_editor_operator_availability_goesUnknown());
+ // do not add 'Goes Disabled' and 'Goes Unknown' for platform
+ if (resourceType.getCategory() != ResourceCategory.PLATFORM) {
+ avails.put(AlertConditionOperator.AVAIL_GOES_DISABLED.name(),
+
MSG.view_alert_definition_condition_editor_operator_availability_goesDisabled());
+ avails.put(AlertConditionOperator.AVAIL_GOES_UNKNOWN.name(),
+
MSG.view_alert_definition_condition_editor_operator_availability_goesUnknown());
+ }
avails.put(AlertConditionOperator.AVAIL_GOES_NOT_UP.name(),
MSG.view_alert_definition_condition_editor_operator_availability_goesNotUp());
avails.put(AlertConditionOperator.AVAIL_GOES_UP.name(),
Show replies by date