modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeHistoryView.java
| 15 ++++++++++
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventAlertJSON.jsp
| 2 -
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventConfigJSON.jsp
| 2 -
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventCreateDeleteChildJSON.jsp
| 4 +-
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventEventsJSON.jsp
| 4 +-
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventOperationsJSON.jsp
| 2 -
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventPluginConfigJSON.jsp
| 2 -
7 files changed, 23 insertions(+), 8 deletions(-)
New commits:
commit 78ac4ad74b991ed8f6b1a90df7cc31cba05e9620
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Fri Apr 1 16:12:58 2011 -0400
BZ 691504 - timeline now links to the new GWT UI where appropriate
diff --git
a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventAlertJSON.jsp
b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventAlertJSON.jsp
index 173fe16..f4b9194 100644
---
a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventAlertJSON.jsp
+++
b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventAlertJSON.jsp
@@ -62,7 +62,7 @@
buf.append("<b>Value:</b>" + log.getValue() +
"</b>");
}
- String link = "/alerts/Alerts.do?mode=viewAlert&id=" +
resourceId + "&a=" + alert.getId();
+ String link = "/coregui/CoreGUI.html#Resource/" + resourceId +
"/Alerts/History/" + alert.getId();
%>
{ "start" : "<%=sdf.format(new Date(alert.getCtime()))%>",
diff --git
a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventConfigJSON.jsp
b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventConfigJSON.jsp
index 6bb34c4..34baadf 100644
---
a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventConfigJSON.jsp
+++
b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventConfigJSON.jsp
@@ -43,7 +43,7 @@
String icon =
FunctionTagLibrary.getResourceConfigStatusURL(configUpdate.getStatus());
- String link = "/rhq/resource/configuration/history.xhtml?id=" +
resourceId + "&configId=" + configUpdate.getId();
+ String link = "/coregui/CoreGUI.html#Resource/" + resourceId +
"/Configuration/History/" + configUpdate.getId();
%>
{ "start" : "<%=sdf.format(configUpdate.getCreatedTime())%>",
diff --git
a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventCreateDeleteChildJSON.jsp
b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventCreateDeleteChildJSON.jsp
index 46f3480..463984e 100644
---
a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventCreateDeleteChildJSON.jsp
+++
b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventCreateDeleteChildJSON.jsp
@@ -58,7 +58,7 @@
icon = "/images/icn_create_child.png"; // TODO
}
- String link = "/rhq/resource/inventory/view.xhtml?id=" + resourceId
;
+ String link = "/coregui/CoreGUI.html#Resource/" + resourceId ;
%>
@@ -95,7 +95,7 @@
icon = "/images/icn_delete_child.png"; // TODO
}
- String link = "/rhq/resource/inventory/view.xhtml?id=" + resourceId
;
+ String link = "/coregui/CoreGUI.html#Resource/" + resourceId ;
%>
{ "start" : "<%=sdf.format(entry.getCreatedTime())%>",
diff --git
a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventEventsJSON.jsp
b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventEventsJSON.jsp
index 5b4320e..bb6ced8 100644
---
a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventEventsJSON.jsp
+++
b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventEventsJSON.jsp
@@ -157,13 +157,13 @@
String color = eventColor(event.getSeverity());
String icon = FunctionTagLibrary.getEventSeverityURL(event.getSeverity(),
grouped);
- String link = "/rhq/resource/events/history.xhtml?id=" + resourceId
+ "&eventId=" + event.getEventId();
+ String link = "/coregui/CoreGUI.html#Resource/" + resourceId +
"/Events/History/" + event.getEventId();
String detail = null;
if (grouped) {
StringBuilder buf = new StringBuilder();
for (EventComposite childEvent : ((GroupedEventComposite)event).events)
{
- buf.append("<a
href='/rhq/resource/events/history.xhtml?id=" + resourceId +
"&eventId=" + childEvent.getEventId() + "'>");
+ buf.append("<a
href='/coregui/CoreGUI.html#Resource/" + resourceId +
"/Events/History/" + childEvent.getEventId() + "'>");
buf.append("<font size=\"-1\" color=\"" +
color + "\">" +
escapeBackslashes(trimLength(childEvent.getEventDetail(),80)) +
"</font></a><br />");
}
detail = buf.toString();
diff --git
a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventOperationsJSON.jsp
b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventOperationsJSON.jsp
index 0846050..5e28985 100644
---
a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventOperationsJSON.jsp
+++
b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventOperationsJSON.jsp
@@ -45,7 +45,7 @@
String icon =
FunctionTagLibrary.getOperationStatusURL(operation.getStatus());
- String link =
"/rhq/resource/operation/resourceOperationHistoryDetails.xhtml?id=" + resourceId
+ "&opId=" + operation.getId();
+ String link = "/coregui/CoreGUI.html#Resource/" + resourceId +
"/Operations/History/" + operation.getId();
// out.write(
// " <event start=\"" + sdf.format(new
Date(operation.getCreatedTime())) + "\" " +
diff --git
a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventPluginConfigJSON.jsp
b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventPluginConfigJSON.jsp
index 06ff3aa..ed75a07 100644
---
a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventPluginConfigJSON.jsp
+++
b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventPluginConfigJSON.jsp
@@ -53,7 +53,7 @@
break;
}
- String link = "/rhq/resource/inventory/history.xhtml?id=" +
resourceId + "&configId=" + configUpdate.getId();
+ String link = "/coregui/CoreGUI.html#Resource/" + resourceId +
"/Inventory/PluginConfigurationHistoryView/" + configUpdate.getId();
%>
commit c30433b4d14efbeda2594b1f4a51ff74715793f8
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Fri Apr 1 16:12:13 2011 -0400
make the timestamp col a link to the details
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeHistoryView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeHistoryView.java
index 65ebb57..8456f2b 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeHistoryView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeHistoryView.java
@@ -50,6 +50,7 @@ import
org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellForma
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
* @author Joseph Marques
@@ -177,6 +178,20 @@ public class EventCompositeHistoryView extends
TableSection<EventCompositeDataso
super.configureTable();
}
+ protected String getDetailsLinkColumnName() {
+ return "timestamp";
+ }
+
+ protected CellFormatter getDetailsLinkColumnCellFormatter() {
+ return new CellFormatter() {
+ public String format(Object value, ListGridRecord record, int rowNum, int
colNum) {
+ Integer recordId = getId(record);
+ String detailsUrl = "#" + getBasePath() + "/" +
recordId;
+ return SeleniumUtility.getLocatableHref(detailsUrl,
TimestampCellFormatter.format(value), null);
+ }
+ };
+ }
+
private void setupTableInteractions() {
TableActionEnablement singleTargetEnablement = hasWriteAccess ?
TableActionEnablement.ANY
: TableActionEnablement.NEVER;
Show replies by date