[jboss-svn-commits] JBL Code SVN: r18576 - in labs/jbosslabs/labs-3.0-build/views/admin: src/main/java/org/jboss/labs/admin and 6 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Feb 25 09:31:04 EST 2008
Author: wrzep
Date: 2008-02-25 09:31:04 -0500 (Mon, 25 Feb 2008)
New Revision: 18576
Added:
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/ShowProjects.java
Modified:
labs/jbosslabs/labs-3.0-build/views/admin/pom.xml
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/Pages.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/ShowNotifications.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/AcceptProject.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/CreateProjectRequest.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/RequestProject.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/ReviewProjectRequest.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/ViewProject.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/user/AcceptJoin.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/user/ReviewJoinRequest.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/confirmation.xhtml
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/hibernate.cfg.xml
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/home.xhtml
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/notifications.xhtml
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/ticket.xhtml
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/user/joinTicket.xhtml
Log:
JBLAB-904 finished breadcrumbs, put conversations in order, upgraded to Seam 2.1.0.A1
Modified: labs/jbosslabs/labs-3.0-build/views/admin/pom.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/pom.xml 2008-02-25 09:32:13 UTC (rev 18575)
+++ labs/jbosslabs/labs-3.0-build/views/admin/pom.xml 2008-02-25 14:31:04 UTC (rev 18576)
@@ -20,7 +20,7 @@
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0.A1</version>
<exclusions>
<exclusion>
<groupId>jboss</groupId>
@@ -31,7 +31,7 @@
<dependency>
<groupId>org.jboss.el</groupId>
<artifactId>jboss-el</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1.GA</version>
<exclusions>
<exclusion>
<groupId>javax.el</groupId>
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-ui</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0.A1</version>
<exclusions>
<exclusion>
<groupId>jboss</groupId>
@@ -53,12 +53,12 @@
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-debug</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0.A1</version>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-mail</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0.A1</version>
</dependency>
<!-- RichFaces -->
<dependency>
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/Pages.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/Pages.java 2008-02-25 09:32:13 UTC (rev 18575)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/Pages.java 2008-02-25 14:31:04 UTC (rev 18576)
@@ -39,7 +39,8 @@
public static final String CREATE_PROJECT_PAGE = PROJECT_PREFIX + "/createProject.seam";
public static final String TICKET_PAGE = PROJECT_PREFIX + "/ticket.seam";
public static final String PROJECT_PAGE = PROJECT_PREFIX + "/project.seam";
-
+ public static final String PROJECTS_PAGE = PROJECT_PREFIX + "/projects.seam";
+
public static final String JOIN_PROJECT_PAGE = USER_PREFIX + "/joinProject.seam";
public static final String SIGN_CA_FIRST_PAGE = USER_PREFIX+ "/signCAfirst.seam";
public static final String JOIN_TICKET_PAGE = USER_PREFIX + "/joinTicket.seam";
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/ShowNotifications.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/ShowNotifications.java 2008-02-25 09:32:13 UTC (rev 18575)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/ShowNotifications.java 2008-02-25 14:31:04 UTC (rev 18576)
@@ -15,14 +15,8 @@
@In private Conversation conversation;
@Begin
- public String show() {
+ public String showNotifications() {
conversation.setDescription("Notifications");
return Pages.NOTIFICATIONS_PAGE;
}
-
- @Begin(nested=true)
- public String continueConv() {
- conversation.setDescription("Continue");
- return Pages.NOTIFICATIONS_PAGE;
- }
}
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/AcceptProject.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/AcceptProject.java 2008-02-25 09:32:13 UTC (rev 18575)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/AcceptProject.java 2008-02-25 14:31:04 UTC (rev 18576)
@@ -24,8 +24,13 @@
package org.jboss.labs.admin.action.project;
import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.End;
+import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.bpm.EndTask;
import org.jboss.seam.annotations.bpm.StartTask;
+import org.jboss.seam.core.Conversation;
+import org.jboss.seam.bpm.TaskInstance;
+import org.jboss.seam.bpm.BusinessProcess;
import org.jboss.labs.admin.Pages;
/**
@@ -35,13 +40,36 @@
@Name("acceptProject")
public class AcceptProject {
- @StartTask @EndTask(transition = "approve")
+ @In private long tId;
+
+ @In Conversation conversation;
+ @In BusinessProcess businessProcess;
+
+ // Hardcoded inside:
+ // @StartTask @EndTask(transition = "approve")
+ // @End
public String accept() {
- return Pages.HOME_PAGE;
+
+ businessProcess.resumeTask(tId);
+ businessProcess.startTask();
+ businessProcess.endTask("approve");
+
+ conversation.end();
+
+ return Pages.NOTIFICATIONS_PAGE;
}
- @StartTask @EndTask(transition = "reject")
+ // Hardcoded inside:
+ // @StartTask @EndTask(transition = "reject")
+ // @End
public String reject() {
- return Pages.HOME_PAGE;
+
+ businessProcess.resumeTask(tId);
+ businessProcess.startTask();
+ businessProcess.endTask("reject");
+
+ conversation.end();
+
+ return Pages.NOTIFICATIONS_PAGE;
}
}
\ No newline at end of file
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/CreateProjectRequest.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/CreateProjectRequest.java 2008-02-25 09:32:13 UTC (rev 18575)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/CreateProjectRequest.java 2008-02-25 14:31:04 UTC (rev 18576)
@@ -27,23 +27,30 @@
import org.jboss.labs.core.model.admin.ProjectRequest;
import org.jboss.labs.core.model.auth.User;
import org.jboss.seam.ScopeType;
+import org.jboss.seam.core.Conversation;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Out;
+import org.jboss.seam.annotations.Begin;
@Name("createProject")
public class CreateProjectRequest {
- @Out(scope= ScopeType.SESSION) private ProjectRequest req;
+ @Out(scope= ScopeType.CONVERSATION) private ProjectRequest req;
//@In private User user; TODO uncomment after auth db is set up
+ @In private Conversation conversation;
+
+ @Begin(nested = true)
public String create() {
req = new ProjectRequest();
req.setEmail("myemail at jboss.org");
//TODO change to req.setEmail(user.getEmail());
+ conversation.setDescription("New Project Request");
+
return Pages.CREATE_PROJECT_PAGE;
}
}
\ No newline at end of file
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/RequestProject.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/RequestProject.java 2008-02-25 09:32:13 UTC (rev 18575)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/RequestProject.java 2008-02-25 14:31:04 UTC (rev 18576)
@@ -26,9 +26,7 @@
import org.jboss.labs.admin.Pages;
import org.jboss.labs.core.model.admin.ProjectRequest;
import org.jboss.seam.ScopeType;
-import org.jboss.seam.annotations.In;
-import org.jboss.seam.annotations.Name;
-import org.jboss.seam.annotations.Out;
+import org.jboss.seam.annotations.*;
import org.jboss.seam.annotations.bpm.CreateProcess;
import org.jboss.seam.bpm.Actor;
import org.jboss.seam.faces.FacesMessages;
@@ -51,16 +49,21 @@
@In(create = true) private EntityManager entityManager;
+ static int counter = 0;
+
+ @End
@CreateProcess(definition = "createProject")
public String request() {
+ System.out.println("invoke " + req.getProjectId());
+
req.setLeadUsername(actor.getId());
entityManager.persist(req);
projectRequestId = req.getId();
- facesMessages.add("Your request has been sent to BMW.");
+ facesMessages.add("Your request has been sent to BMW. " + counter++);
return Pages.CONFIRMATION_PAGE;
}
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/ReviewProjectRequest.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/ReviewProjectRequest.java 2008-02-25 09:32:13 UTC (rev 18575)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/ReviewProjectRequest.java 2008-02-25 14:31:04 UTC (rev 18576)
@@ -26,9 +26,11 @@
import org.jboss.labs.core.model.admin.ProjectRequest;
import org.jboss.labs.admin.Pages;
import org.jboss.seam.ScopeType;
+import org.jboss.seam.core.Conversation;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Out;
+import org.jboss.seam.annotations.Begin;
import javax.persistence.EntityManager;
@@ -43,12 +45,16 @@
@Out(required = false, scope= ScopeType.CONVERSATION) private ProjectRequest prjRequest;
@In private EntityManager entityManager;
+ @In private Conversation conversation;
+ @Begin(nested = true)
public String select(Long taskId, Integer projectRequestId) {
this.tId = taskId;
prjRequest = entityManager.find(ProjectRequest.class, projectRequestId);
+ conversation.setDescription("Request to create project '" + prjRequest.getName() + "'");
+
return Pages.TICKET_PAGE;
}
}
\ No newline at end of file
Added: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/ShowProjects.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/ShowProjects.java (rev 0)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/ShowProjects.java 2008-02-25 14:31:04 UTC (rev 18576)
@@ -0,0 +1,28 @@
+package org.jboss.labs.admin.action.project;
+
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Begin;
+import org.jboss.seam.annotations.In;
+import org.jboss.seam.core.Conversation;
+import org.jboss.labs.admin.Pages;
+
+/**
+ * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org)
+ */
+ at Name("showProjects")
+public class ShowProjects {
+
+ @In private Conversation conversation;
+
+ @Begin
+ public String showProjects() {
+ conversation.setDescription("Projects");
+ return Pages.PROJECTS_PAGE;
+ }
+
+ @Begin(nested=true)
+ public String continueConv() {
+ conversation.setDescription("Continue");
+ return Pages.NOTIFICATIONS_PAGE;
+ }
+}
\ No newline at end of file
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/ViewProject.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/ViewProject.java 2008-02-25 09:32:13 UTC (rev 18575)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/ViewProject.java 2008-02-25 14:31:04 UTC (rev 18576)
@@ -29,13 +29,11 @@
import org.jboss.labs.injection.seam.Guice;
import org.jboss.labs.exception.admin.ProjectNotFoundException;
import org.jboss.labs.admin.Pages;
-import org.jboss.seam.annotations.Logger;
-import org.jboss.seam.annotations.Name;
-import org.jboss.seam.annotations.Out;
-import org.jboss.seam.annotations.Begin;
+import org.jboss.seam.annotations.*;
import org.jboss.seam.annotations.web.RequestParameter;
import org.jboss.seam.log.Log;
import org.jboss.seam.ScopeType;
+import org.jboss.seam.core.Conversation;
@Name("viewProject")
@@ -46,13 +44,18 @@
@Inject private ProjectService projectService;
+ @Out(scope = ScopeType.CONVERSATION) private Project project;
+
@Logger private Log log;
- @Out(scope = ScopeType.SESSION) private Project project;
+ @In private Conversation conversation;
+ @Begin(nested=true)
public String view(String projectId) throws ProjectNotFoundException {
project = projectService.getProject(projectId);
+
+ conversation.setDescription(project.getName());
return Pages.PROJECT_PAGE;
}
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/user/AcceptJoin.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/user/AcceptJoin.java 2008-02-25 09:32:13 UTC (rev 18575)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/user/AcceptJoin.java 2008-02-25 14:31:04 UTC (rev 18576)
@@ -24,8 +24,12 @@
package org.jboss.labs.admin.action.user;
import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.End;
+import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.bpm.EndTask;
import org.jboss.seam.annotations.bpm.StartTask;
+import org.jboss.seam.core.Conversation;
+import org.jboss.seam.bpm.BusinessProcess;
import org.jboss.labs.admin.Pages;
/**
@@ -35,13 +39,36 @@
@Name("acceptJoin")
public class AcceptJoin {
- @StartTask @EndTask(transition = "approve")
+ @In private long tId;
+
+ @In Conversation conversation;
+ @In BusinessProcess businessProcess;
+
+ // Hardcoded inside:
+ // @StartTask @EndTask(transition = "approve")
+ // @End
public String accept() {
- return Pages.HOME_PAGE;
+
+ businessProcess.resumeTask(tId);
+ businessProcess.startTask();
+ businessProcess.endTask("approve");
+
+ conversation.end();
+
+ return Pages.NOTIFICATIONS_PAGE;
}
- @StartTask @EndTask(transition = "reject")
+ // Hardcoded inside:
+ // @StartTask @EndTask(transition = "reject")
+ // @End
public String reject() {
- return Pages.HOME_PAGE;
+
+ businessProcess.resumeTask(tId);
+ businessProcess.startTask();
+ businessProcess.endTask("reject");
+
+ conversation.end();
+
+ return Pages.NOTIFICATIONS_PAGE;
}
}
\ No newline at end of file
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/user/ReviewJoinRequest.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/user/ReviewJoinRequest.java 2008-02-25 09:32:13 UTC (rev 18575)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/user/ReviewJoinRequest.java 2008-02-25 14:31:04 UTC (rev 18576)
@@ -27,9 +27,11 @@
import org.jboss.labs.core.model.admin.JoinRequest;
import org.jboss.labs.admin.Pages;
import org.jboss.seam.ScopeType;
+import org.jboss.seam.core.Conversation;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Out;
+import org.jboss.seam.annotations.Begin;
import javax.persistence.EntityManager;
@@ -44,12 +46,17 @@
@Out(required = false, scope= ScopeType.CONVERSATION) private JoinRequest jRequest;
@In private EntityManager entityManager;
+ @In private Conversation conversation;
+ @Begin(nested = true)
public String select(Long taskId, Integer joinRequestId) {
this.tId = taskId;
jRequest = entityManager.find(JoinRequest.class, joinRequestId);
+ conversation.setDescription("Request from user '" + jRequest.getUsername() +
+ "' to join project '" + jRequest.getProjectId() + "'");
+
return Pages.JOIN_TICKET_PAGE;
}
}
\ No newline at end of file
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/confirmation.xhtml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/confirmation.xhtml 2008-02-25 09:32:13 UTC (rev 18575)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/confirmation.xhtml 2008-02-25 14:31:04 UTC (rev 18576)
@@ -10,7 +10,7 @@
<ui:define name="body">
- <h:messages globalOnly="true" styleClass="message"/>
+ <ui:remove>Nothing here. Messages are displayed by default in template.xhtml.</ui:remove>
</ui:define>
</ui:composition>
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/hibernate.cfg.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/hibernate.cfg.xml 2008-02-25 09:32:13 UTC (rev 18575)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/hibernate.cfg.xml 2008-02-25 14:31:04 UTC (rev 18576)
@@ -8,7 +8,7 @@
<session-factory>
<property name="show_sql">false</property>
- <property name="connection.datasource">java:/JBossDS</property>
+ <property name="connection.datasource">java:/LabsDS</property>
<property name="transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property>
<property name="transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
<property name="cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/home.xhtml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/home.xhtml 2008-02-25 09:32:13 UTC (rev 18575)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/home.xhtml 2008-02-25 14:31:04 UTC (rev 18576)
@@ -13,9 +13,9 @@
<h:form id="mainForm">
<ul>
<li>
- <s:link value="Notifications" action="#{showNotifications.show}" />
+ <s:link value="Notifications" action="#{showNotifications.showNotifications}" />
</li>
- <li><h:commandLink value="Projects" action="/project/projects.seam"/></li>
+ <li><s:link value="Projects" action="#{showProjects.showProjects}"/></li>
</ul>
</h:form>
</ui:define>
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/notifications.xhtml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/notifications.xhtml 2008-02-25 09:32:13 UTC (rev 18575)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/notifications.xhtml 2008-02-25 14:31:04 UTC (rev 18576)
@@ -10,9 +10,6 @@
<ui:define name="body">
<h2>Notifications</h2>
- <s:link value="Dalej" action="#{showNotifications.continueConv}" >
- <s:conversationName value="Ctnd"/>
- </s:link>
<h:form id="mainForm">
<h:dataTable value="#{pooledTaskInstanceList}"
rendered="#{! empty pooledTaskInstanceList}"
@@ -24,10 +21,10 @@
</h:column>
<h:column>
<f:facet name="header">Description</f:facet>
- <h:commandLink value="#{task.description} (CP)"
+ <h:commandLink value="#{task.description}"
action="#{reviewProjectRequest.select(task.id, task.variables['projectRequestId'])}"
rendered="#{not empty (task.variables['projectRequestId'])}"/>
- <h:commandLink value="#{task.description} (JP)"
+ <h:commandLink value="#{task.description}"
action="#{reviewJoinRequest.select(task.id, task.variables['joinRequestId'])}"
rendered="#{not empty (task.variables['joinRequestId'])}"/>
</h:column>
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/ticket.xhtml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/ticket.xhtml 2008-02-25 09:32:13 UTC (rev 18575)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/ticket.xhtml 2008-02-25 14:31:04 UTC (rev 18576)
@@ -57,7 +57,9 @@
<f:param name="taskId" value="#{tId}" />
</h:commandLink>
<span/>
- <h:commandLink value="Cancel" action="/home.seam" />
+ <h:commandLink value="Cancel" action="/notifications.seam" >
+ <s:conversationPropagation type="end"/>
+ </h:commandLink>
</h:form>
</rich:panel>
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/user/joinTicket.xhtml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/user/joinTicket.xhtml 2008-02-25 09:32:13 UTC (rev 18575)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/user/joinTicket.xhtml 2008-02-25 14:31:04 UTC (rev 18576)
@@ -24,7 +24,9 @@
<f:param name="taskId" value="#{tId}" />
</h:commandLink>
<span/>
- <h:commandLink value="Cancel" action="/home.seam" />
+ <h:commandLink value="Cancel" action="/notifications.seam" >
+ <s:conversationPropagation type="end"/>
+ </h:commandLink>
</h:form>
</rich:panel>
More information about the jboss-svn-commits
mailing list