Author: dcrutchf
Date: 2009-11-18 10:46:32 -0800 (Wed, 18 Nov 2009)
New Revision: 13959
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=13959
Modified:
trunk/src/org/hyperic/hq/ui/action/resource/common/inventory/EditConfigPropertiesAction.java
trunk/web/WEB-INF/classes/ApplicationResources.properties
Log:
[HHQ-3460] - Control tab not displayed for Platform types
Modified: trunk/src/org/hyperic/hq/ui/action/resource/common/inventory/EditConfigPropertiesAction.java
===================================================================
--- trunk/src/org/hyperic/hq/ui/action/resource/common/inventory/EditConfigPropertiesAction.java 2009-11-18 18:12:06 UTC (rev 13958)
+++ trunk/src/org/hyperic/hq/ui/action/resource/common/inventory/EditConfigPropertiesAction.java 2009-11-18 18:46:32 UTC (rev 13959)
@@ -200,7 +200,7 @@
} else {
if ( i == ProductPlugin.CFGTYPE_IDX_RESPONSE_TIME ) {
- if ( aeid.isServer() ) {
+ if (aeid.isServer() || aeid.isPlatform()) {
// On servers, RT always gets an empty config
allConfigs.setConfig(i, new ConfigResponse());
allConfigs.setShouldConfig(i, true);
@@ -215,8 +215,8 @@
}
}
if ( i == ProductPlugin.CFGTYPE_IDX_CONTROL
- && !aeid.isService() && !aeid.isServer() ) {
- // Control is only supported on servers and services
+ && !aeid.isService() && !aeid.isServer() && !aeid.isPlatform() ) {
+ // Control is only supported on platforms, servers and services
blankoutConfig(i, allConfigs, allConfigsRollback);
continue;
}
Modified: trunk/web/WEB-INF/classes/ApplicationResources.properties
===================================================================
--- trunk/web/WEB-INF/classes/ApplicationResources.properties 2009-11-18 18:12:06 UTC (rev 13958)
+++ trunk/web/WEB-INF/classes/ApplicationResources.properties 2009-11-18 18:46:32 UTC (rev 13959)
@@ -659,6 +659,8 @@
admin.settings.SNMPGenericID=Generic ID:
admin.settings.SNMPSpecificID=Specific ID:
admin.settings.SNMPAgentAddress=Agent Address:
+admin.settings.SNMPNotificationMechanism=Notification Mechanism:
+admin.settings.SNMPDefaultNotificationMechanism=Default Notification Mechanism:
admin.settings.UseLDAPAuth=Use LDAP Authentication
@@ -1313,6 +1315,7 @@
resource.group.ControlHistory.ListContent.Start=Start
resource.group.ControlHistory.ListContent.Stop=Stop
+resource.platform.ControlStatus.Tab=Current Status
resource.server.ControlStatus.Tab=Current Status
resource.service.ControlStatus.Tab=Current Status
resource.group.ControlStatus.Tab=Current Status
@@ -2024,6 +2027,7 @@
alert.config.edit.snmp.address=Address of the target SNMP engine:
alert.config.edit.snmp.oid=OID:
+alert.config.edit.snmp.notificationMechanism=Notification Mechanism:
alert.config.edit.opennms.server=Server:
alert.config.edit.opennms.ip=IP (optional):
@@ -2041,7 +2045,7 @@
monitoring.events.MiniTabs.Roles=Notify Roles
monitoring.events.MiniTabs.Users=Notify HQ Users
monitoring.events.MiniTabs.Others=Notify Other Recipients
-monitoring.events.MiniTabs.SNMP=SNMP Trap
+monitoring.events.MiniTabs.SNMP=SNMP Notification
monitoring.events.MiniTabs.Escalation=Escalation
monitoring.events.MiniTabs.Script=Script
monitoring.events.MiniTabs.OpenNMS=OpenNMS
|
