modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeTableView.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
New commits: commit d358659593babd37dcdd520016ee7cc7b61c3077 Author: Jirka Kremser jkremser@redhat.com Date: Fri Aug 23 12:42:21 2013 +0200
Fixing the (un)deploy storage node button enablement rules.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeTableView.java index 7ee0b5a..528d7d8 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeTableView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeTableView.java @@ -483,8 +483,7 @@ public class StorageNodeTableView extends TableSection<StorageNodeDatasource> { if ("NORMAL".equals(storageNodeRecord.getAttributeAsString(FIELD_STATUS.propertyName())) || "JOINING".equals(storageNodeRecord.getAttributeAsString(FIELD_STATUS.propertyName())) || "LEAVING".equals(storageNodeRecord.getAttributeAsString(FIELD_STATUS.propertyName())) - || !AvailabilityType.UP.equals(String.valueOf(storageNodeRecord.getAttribute(FIELD_AVAILABILITY - .propertyName())))) { + || !AvailabilityType.UP.equals(storageNodeRecord.getAttributeAsObject(FIELD_AVAILABILITY.propertyName()))) { return false; } } @@ -508,8 +507,7 @@ public class StorageNodeTableView extends TableSection<StorageNodeDatasource> { for (ListGridRecord storageNodeRecord : selection) { if ("JOINING".equals(storageNodeRecord.getAttributeAsString(FIELD_STATUS.propertyName())) || "LEAVING".equals(storageNodeRecord.getAttributeAsString(FIELD_STATUS.propertyName())) - || !AvailabilityType.UP.equals(String.valueOf(storageNodeRecord.getAttribute(FIELD_AVAILABILITY - .propertyName())))) { + || !AvailabilityType.UP.equals(storageNodeRecord.getAttributeAsObject(FIELD_AVAILABILITY.propertyName()))) { return false; } } @@ -525,8 +523,7 @@ public class StorageNodeTableView extends TableSection<StorageNodeDatasource> { } if (StorageNode.Status.NORMAL.toString().equals( storageNodeRecord.getAttributeAsString(FIELD_STATUS.propertyName())) - && AvailabilityType.UP.equals(String.valueOf(storageNodeRecord.getAttribute(FIELD_AVAILABILITY - .propertyName())))) { + && AvailabilityType.UP.equals(storageNodeRecord.getAttributeAsObject(FIELD_AVAILABILITY.propertyName()))) { nodesInNormalCouner++; } }
rhq-commits@lists.fedorahosted.org