modules/enterprise/gui/portal-war/src/main/webapp/rhq/subsystem/alertDefinitions.xhtml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
New commits: commit 28951fe704b7eb584d24161dcc6d4f2952222254 Author: John Sanda jsanda@redhat.com Date: Tue May 25 15:28:08 2010 -0400
[BZ 591490] Reverting alert links back to struts links since that UI code was reverted back to struts
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/subsystem/alertDefinitions.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/subsystem/alertDefinitions.xhtml index a1caee7..863357b 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/subsystem/alertDefinitions.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/subsystem/alertDefinitions.xhtml @@ -143,17 +143,20 @@ </onc:sortableColumnHeader> </f:facet>
- <h:outputLink value="/rhq/resource/alert/viewAlert.xhtml" rendered="#{empty item.original.alertDefinition.resourceType and empty item.original.alertDefinition.resourceGroup}"> + <h:outputLink value="/alerts/Config.do" rendered="#{empty item.original.alertDefinition.resourceType and empty item.original.alertDefinition.resourceGroup}"> + <f:param name="mode" value="viewRoles" /> <f:param name="id" value="#{item.original.alertDefinition.resource.id}" /> <f:param name="ad" value="#{item.original.alertDefinition.id}" /> <h:outputText value="#{item.original.alertDefinition.name}" /> </h:outputLink> - <h:outputLink value="/rhq/resource/alert/viewAlert.xhtml" rendered="#{not empty item.original.alertDefinition.resourceType}"> + <h:outputLink value="/alerts/Config.do" rendered="#{not empty item.original.alertDefinition.resourceType}"> + <f:param name="mode" value="viewRoles" /> <f:param name="type" value="#{item.original.alertDefinition.resourceType.id}" /> <f:param name="ad" value="#{item.original.alertDefinition.id}" /> <h:outputText value="#{item.original.alertDefinition.name}" /> </h:outputLink> - <h:outputLink value="/rhq/resource/alert/viewAlert.xhtml" rendered="#{not empty item.original.alertDefinition.resourceGroup}"> + <h:outputLink value="/alerts/Config.do" rendered="#{not empty item.original.alertDefinition.resourceGroup}"> + <f:param name="mode" value="viewRoles" /> <f:param name="groupId" value="#{item.original.alertDefinition.resourceGroup.id}" /> <f:param name="ad" value="#{item.original.alertDefinition.id}" /> <h:outputText value="#{item.original.alertDefinition.name}" />
rhq-commits@lists.fedorahosted.org