modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java
| 4 ++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDataSource.java
| 7 ++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
New commits:
commit f1da38a0dbdaa91ef9f938578ddcb3f78ec7460e
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Wed Feb 23 21:17:37 2011 -0500
bz 679130 - finish the resource config history page.
we now have rollback working
the delete button works now
we see additional column data including a link to the group history item if there is
one (note, group history GWT pages don't exist yet)
there is now a green check box with a hover message over the ID column that represents
the current config
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java
index 640ba32..5ea1c98 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java
@@ -87,6 +87,10 @@ public class LinkManager {
return getResourceGroupLink(groupId) +
"/Inventory/ConnectionSettingsHistory";
}
+ public static String getGroupResourceConfigurationUpdateHistoryLink(int groupId, int
groupUpdateHistoryId) {
+ return getResourceGroupLink(groupId) + "/Configuration/History/" +
groupUpdateHistoryId;
+ }
+
public static String getGroupOperationHistoryLink(int groupId, int
groupOperationHistoryId) {
return getResourceGroupLink(groupId) + "/Operations/History/" +
groupOperationHistoryId;
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDataSource.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDataSource.java
index 83f730e..17b3bfc 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDataSource.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDataSource.java
@@ -71,6 +71,7 @@ public class ConfigurationHistoryDataSource extends
RPCDataSource<ResourceConfig
public static final String RESOURCE_TYPE_ID = "resourceTypeId";
public static final String CONFIGURATION = "configuration";
public static final String GROUP_CONFIG_UPDATE_ID =
"groupConfigUpdateId";
+ public static final String GROUP_ID = "groupId"; // will only be
non-null if group config update id is non-null
public static final String DURATION = "duration";
public static final String ERROR_MESSAGE = "errorMessage";
public static final String MODIFIED_TIME = "modifiedTime";
@@ -193,7 +194,10 @@ public class ConfigurationHistoryDataSource extends
RPCDataSource<ResourceConfig
if (value == null) {
return MSG.dataSource_configurationHistory_updateType_individual();
}
- return MSG.dataSource_configurationHistory_updateType_group();
+ Integer groupId = record.getAttributeAsInt(Field.GROUP_ID);
+ return "<a href=\""
+ + LinkManager.getGroupResourceConfigurationUpdateHistoryLink(groupId,
((Number) value).intValue())
+ + "\">" +
MSG.dataSource_configurationHistory_updateType_group() + "</a>";
}
});
fields.add(updateTypeField);
@@ -330,6 +334,7 @@ public class ConfigurationHistoryDataSource extends
RPCDataSource<ResourceConfig
}
if (from.getGroupConfigurationUpdate() != null) {
record.setAttribute(Field.GROUP_CONFIG_UPDATE_ID,
from.getGroupConfigurationUpdate().getId());
+ record.setAttribute(Field.GROUP_ID,
from.getGroupConfigurationUpdate().getGroup().getId()); // note group must be eagerly
loaded here
}
record.setAttribute(Field.OBJECT, from);
return record;
Show replies by date