modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation/alert-navigation.xml
| 58 ++--------
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/listAlertDefinitions.xhtml
| 4
2 files changed, 19 insertions(+), 43 deletions(-)
New commits:
commit 93f468ce9ad6d57cb674664387ecd349cd87e8f7
Merge: c35bfd3... 722cd2d...
Author: Ian P. Springer <ips(a)jetengine.(none)>
Date: Wed Mar 31 12:04:53 2010 -0400
Merge branch 'master' into bugfixes
commit 722cd2d5bef232d55e3f4c44cf822cd5e3612531
Merge: cffa6ea... 1282e2d...
Author: Ian P. Springer <ips(a)jetengine.(none)>
Date: Tue Mar 30 10:39:26 2010 -0400
Merge branch 'master' of
ssh://git.fedorahosted.org/git/rhq/rhq
commit 1282e2df1d35f8d6b3febeb1d03e8e6c007c9e5d
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue Mar 30 14:20:50 2010 +0200
Revert navigation to the struts-based alert-configuration
diff --git
a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation/alert-navigation.xml
b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation/alert-navigation.xml
index a9dd7b4..a28536b 100644
---
a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation/alert-navigation.xml
+++
b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation/alert-navigation.xml
@@ -17,19 +17,19 @@
<navigation-case>
<from-outcome>createNewAlertDefinition</from-outcome>
-
<to-view-id>/rhq/resource/alert/newAlert.xhtml?id=#{param.id}</to-view-id>
+
<to-view-id>/alerts/Config.do?id=#{param.id}&mode=new</to-view-id>
<redirect/>
</navigation-case>
-
+
<navigation-case>
- <!-- sorting rule -->
+ <!-- sorting rule -->
<from-outcome>sort</from-outcome>
<to-view-id>/rhq/resource/alert/listAlertDefinitions.xhtml?id=#{param.id}</to-view-id>
<redirect/>
- </navigation-case>
-
+ </navigation-case>
+
</navigation-rule>
-
+
<!-- Alert Templates List -->
<navigation-rule>
<from-view-id>/rhq/admin/listAlertTemplates.xhtml</from-view-id>
@@ -46,16 +46,16 @@
<to-view-id>/alerts/Config.do?type=#{param.type}&mode=new</to-view-id>
<redirect/>
</navigation-case>
-
+
<navigation-case>
- <!-- sorting rule -->
+ <!-- sorting rule -->
<from-outcome>sort</from-outcome>
<to-view-id>/rhq/admin/listAlertTemplates.xhtml?type=#{param.type}</to-view-id>
<redirect/>
- </navigation-case>
-
+ </navigation-case>
+
</navigation-rule>
-
+
<!-- Alert History List -->
<navigation-rule>
<from-view-id>/rhq/resource/alert/listAlertHistory.xhtml</from-view-id>
@@ -73,14 +73,14 @@
<to-view-id>/rhq/resource/alert/listAlertHistory.xhtml?id=#{param.id}</to-view-id>
<redirect/>
</navigation-case>
-
+
<navigation-case>
- <!-- sorting rule -->
+ <!-- sorting rule -->
<from-outcome>sort</from-outcome>
<to-view-id>/rhq/resource/alert/listAlertHistory.xhtml?id=#{param.id}</to-view-id>
<redirect/>
- </navigation-case>
-
+ </navigation-case>
+
</navigation-rule>
<navigation-rule>
@@ -89,7 +89,7 @@
<navigation-case>
<from-outcome>success</from-outcome>
<to-view-id>/rhq/resource/alert/viewAlert.xhtml?ad=#{alertDefinition.id}&nid=#{alertNotificationsUIBean.activeNotification.id}</to-view-id>
-
+
<redirect />
</navigation-case>
@@ -119,30 +119,4 @@
</navigation-rule>
- <navigation-rule>
-
<from-view-id>/rhq/resource/alert/listConditions.xhtml</from-view-id>
-
- <navigation-case>
- <from-outcome>success</from-outcome>
-
<to-view-id>/rhq/resource/alert/viewAlert.xhtml?ad=#{alertDefinition.id}</to-view-id>
-
- <redirect />
- </navigation-case>
-
- </navigation-rule>
-
- <navigation-rule>
- <from-view-id>/rhq/resource/alert/newAlert.xhtml</from-view-id>
-
- <navigation-case>
- <from-outcome>success</from-outcome>
-
<to-view-id>/rhq/resource/alert/viewAlert.xhtml?ad=#{alertDefinition.id}</to-view-id>
-
- <redirect />
- </navigation-case>
-
- </navigation-rule>
-
-
-
</faces-config>
diff --git
a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/listAlertDefinitions.xhtml
b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/listAlertDefinitions.xhtml
index ef13121..8f369b7 100644
---
a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/listAlertDefinitions.xhtml
+++
b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/listAlertDefinitions.xhtml
@@ -108,8 +108,10 @@
<h:outputText styleClass="headerText"
value="Parent" />
</f:facet>
- <h:outputLink
value="http://localhost:7080/rhq/resource/alert/viewAlert.xhtml"
rendered="#{item.parentId ne 0}">
+ <h:outputLink value="/alerts/Config.do"
rendered="#{item.parentId ne 0}">
+ <f:param name="mode" value="viewRoles"/>
<f:param name="type"
value="#{item.resource.resourceType.id}"/>
+ <f:param name="from" value="#{item.id}"/>
<f:param name="ad"
value="#{item.parentId}"/>
<h:outputText value="View Template" />
</h:outputLink>