modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionDataSource.java
| 6 ++++--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionsView.java
| 8 ++++++++
2 files changed, 12 insertions(+), 2 deletions(-)
New commits:
commit f51dc89b22f37762d277af23810405b6d1d5309c
Author: John Sanda <jsanda(a)redhat.com>
Date: Thu Nov 3 10:21:38 2011 -0400
[BZ 738404] Disable 'Detect Now' button for disabled definitons
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionDataSource.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionDataSource.java
index 71ffeca..3bb7161 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionDataSource.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionDataSource.java
@@ -68,6 +68,7 @@ public class DriftDefinitionDataSource extends
RPCDataSource<DriftDefinitionComp
public static final String ATTR_DRIFT_HANDLING_MODE = "driftHandlingMode";
public static final String ATTR_BASE_DIR_STRING = "baseDirString";
public static final String ATTR_IS_ENABLED = "isEnabled";
+ public static final String ATTR_IS_ENABLED_ICON = "isEnabledIcon";
public static final String ATTR_EDIT = "edit";
public static final String ATTR_IS_PINNED = "isPinned";
public static final String ATTR_CHANGE_SET_CTIME = "changesetTime";
@@ -138,7 +139,7 @@ public class DriftDefinitionDataSource extends
RPCDataSource<DriftDefinitionComp
changeSetTimeField.setCanSortClientOnly(true);
fields.add(changeSetTimeField);
- ListGridField enabledField = new ListGridField(ATTR_IS_ENABLED,
MSG.common_title_enabled());
+ ListGridField enabledField = new ListGridField(ATTR_IS_ENABLED_ICON,
MSG.common_title_enabled());
enabledField.setType(ListGridFieldType.IMAGE);
enabledField.setAlign(Alignment.CENTER);
fields.add(enabledField);
@@ -333,7 +334,8 @@ public class DriftDefinitionDataSource extends
RPCDataSource<DriftDefinitionComp
record.setAttribute(ATTR_DRIFT_HANDLING_MODE,
getDriftHandlingModeDisplayName(def.getDriftHandlingMode()));
record.setAttribute(ATTR_INTERVAL, String.valueOf(def.getInterval()));
record.setAttribute(ATTR_BASE_DIR_STRING, getBaseDirString(def.getBasedir()));
- record.setAttribute(ATTR_IS_ENABLED,
ImageManager.getAvailabilityIcon(def.isEnabled()));
+ record.setAttribute(ATTR_IS_ENABLED, String.valueOf(def.isEnabled()));
+ record.setAttribute(ATTR_IS_ENABLED_ICON,
ImageManager.getAvailabilityIcon(def.isEnabled()));
// fixed value, just the edit icon
record.setAttribute(ATTR_EDIT, ImageManager.getEditIcon());
record.setAttribute(ATTR_IS_PINNED, def.isPinned() ? ImageManager.getPinnedIcon()
: ImageManager
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionsView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionsView.java
index f3e5d84..ca11132 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionsView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionsView.java
@@ -163,6 +163,14 @@ public class DriftDefinitionsView extends
TableSection<DriftDefinitionDataSource
addTableAction("DetectNow", MSG.view_drift_button_detectNow(), null,
new AbstractTableAction(
detectNowEnablement) {
+ @Override
+ public boolean isEnabled(ListGridRecord[] selection) {
+ if (selection.length == 0) {
+ return false;
+ }
+ return
Boolean.valueOf(selection[0].getAttribute(DriftDefinitionDataSource.ATTR_IS_ENABLED));
+ }
+
public void executeAction(ListGridRecord[] selection, Object actionValue) {
detectDrift(selection); // will only ever be a single selection - see
detectNowEnablement variable
}
Show replies by date