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/common/detail/operation/history/AbstractOperationHistoryDataSource.java
| 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryDetailsView.java
| 4 ++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDataSource.java
| 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDetailsView.java
| 17 ++++++++--
5 files changed, 24 insertions(+), 3 deletions(-)
New commits:
commit b0b0a4a89cc58b8d9bbfaa18c4314f95be616dc3
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Fri Feb 11 14:27:49 2011 -0500
on resource op history detail view, link to parent group op history, if there is a
parent group op
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 9c9307e..1dc2dcf 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 getGroupOperationHistoryLink(int groupId, int
groupOperationHistoryId) {
+ return getResourceGroupLink(groupId) + "/Operations/History/" +
groupOperationHistoryId;
+ }
+
public static String getGroupDefinitionLink(int groupDefinitionId) {
if (GWT) {
return "#Inventory/Groups/DynagroupDefinitions/" +
groupDefinitionId;
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryDataSource.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryDataSource.java
index 989857d..6b8fcb4 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryDataSource.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryDataSource.java
@@ -32,7 +32,6 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.gwt.OperationGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
-import java.util.Date;
import java.util.List;
/**
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryDetailsView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryDetailsView.java
index fc87592..b74a387 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryDetailsView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryDetailsView.java
@@ -142,6 +142,10 @@ public abstract class AbstractOperationHistoryDetailsView<T
extends OperationHis
OperationRequestStatus status = operationHistory.getStatus();
+ StaticTextItem idItem = new
StaticTextItem(AbstractOperationHistoryDataSource.Field.ID, "Execution ID");
+ idItem.setValue(operationHistory.getId());
+ items.add(idItem);
+
StaticTextItem operationItem = new
StaticTextItem(AbstractOperationHistoryDataSource.Field.OPERATION_NAME, MSG
.view_operationHistoryDetails_operation());
OperationDefinition operationDefinition =
operationHistory.getOperationDefinition();
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDataSource.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDataSource.java
index 1597f8b..15d1f01 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDataSource.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDataSource.java
@@ -47,6 +47,7 @@ public class ResourceOperationHistoryDataSource extends
AbstractOperationHistory
public static abstract class Field extends AbstractOperationHistoryDataSource.Field
{
public static final String RESOURCE = "resource";
+ public static final String GROUP_OPERATION_HISTORY =
"groupOperationHistory";
}
public static abstract class CriteriaField {
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDetailsView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDetailsView.java
index 09a50fe..9c93065 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDetailsView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDetailsView.java
@@ -26,12 +26,14 @@ import com.smartgwt.client.widgets.form.fields.FormItem;
import com.smartgwt.client.widgets.form.fields.StaticTextItem;
import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
import org.rhq.core.domain.criteria.ResourceOperationHistoryCriteria;
+import org.rhq.core.domain.operation.GroupOperationHistory;
import org.rhq.core.domain.operation.OperationDefinition;
import org.rhq.core.domain.operation.OperationRequestStatus;
import org.rhq.core.domain.operation.ResourceOperationHistory;
import org.rhq.core.domain.resource.composite.DisambiguationReport;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.LinkManager;
import
org.rhq.enterprise.gui.coregui.client.components.configuration.ConfigurationEditor;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import
org.rhq.enterprise.gui.coregui.client.inventory.common.detail.operation.history.AbstractOperationHistoryDetailsView;
@@ -63,9 +65,20 @@ public class ResourceOperationHistoryDetailsView extends
AbstractOperationHistor
List<FormItem> items = super.createFields(operationHistory);
if (this.showResourceField) {
- StaticTextItem resourceItem = new StaticTextItem("resource",
"Resource");
+ StaticTextItem resourceItem = new
StaticTextItem(ResourceOperationHistoryDataSource.Field.RESOURCE,
+ "Resource");
resourceItem.setValue(this.disambiguatedResourceName);
- items.add(0, resourceItem);
+ items.add(1, resourceItem);
+ }
+
+ GroupOperationHistory groupOperationHistory =
operationHistory.getGroupOperationHistory();
+ if (groupOperationHistory != null) {
+ StaticTextItem groupOperationHistoryItem = new StaticTextItem(
+ ResourceOperationHistoryDataSource.Field.GROUP_OPERATION_HISTORY,
"Parent Group Execution");
+ String groupOperationHistoryUrl =
LinkManager.getGroupOperationHistoryLink(groupOperationHistory.getGroup().getId(),
groupOperationHistory.getId());
+ String value = "<a href=\"" + groupOperationHistoryUrl +
"\">" + groupOperationHistory.getId() + "</a> (on group
'" + groupOperationHistory.getGroup().getName() + "')";
+ groupOperationHistoryItem.setValue(value);
+ items.add(groupOperationHistoryItem);
}
return items;
Show replies by date