Redirect to previous page when 'cancel' is clicked on request to join…

… group: https://bugzilla.redhat.com/show_bug.cgi?id=1060973
zanata · Feb 11, 2014 · a5c32c9 · a5c32c9
1 parent 861a70a
commit a5c32c9
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 23 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java b/zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
@@ -140,7 +140,7 @@ public String send() {
         } else {
             FacesMessages.instance().add(
                     "#{messages['jsf.NoProjectVersionSelected']}");
-            return "success";
+            return "failure";
         }
     }
 

diff --git a/zanata-war/src/main/resources/messages.properties b/zanata-war/src/main/resources/messages.properties
@@ -833,7 +833,7 @@ jsf.AdditionalInfo=Additional information
 jsf.email.MessageBody=Message
 jsf.email.Send=Send Message
 jsf.NoProjects=No projects to display.
-jsf.RequestToAddProjectVersionToGroup=Request to add project version(s) to group '{0}'
+jsf.RequestToAddProjectVersionToGroup=Request to add project version(s) to group \"{0}\"
 jsf.NoProjectVersionSelected=No project version selected.
 jsf.ClickSendMessageToProceedRequest=Enter additional information and click 'Send Message' to proceed
 jsf.RequestAddProjectToGroup=Request to add a project to {0}

diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/version-group/request_join.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/version-group/request_join.xhtml
@@ -83,7 +83,7 @@
         <h:commandButton id="send" value="#{messages['jsf.email.Send']}"
           action="#{versionGroupJoinAction.send}"/>
 
-        <s:button id="cancel" value="#{messages['jsf.Cancel']}"
+        <h:commandButton id="cancel" value="#{messages['jsf.Cancel']}"
           propagation="none" action="#{versionGroupJoinAction.cancel}"/>
       </div>
 

diff --git a/zanata-war/src/main/webapp/WEB-INF/pages.xml b/zanata-war/src/main/webapp/WEB-INF/pages.xml
@@ -424,21 +424,17 @@
     <navigation from-action="#{versionGroupJoinAction.send}">
       <rule if-outcome="success">
         <redirect view-id="/version-group/version_group.xhtml">
-          <param name="versionGroupSlug"
-            value="#{versionGroupJoinAction.slug}" />
+          <param name="versionGroupSlug" value="#{versionGroupJoinAction.slug}" />
         </redirect>
       </rule>
       <rule if-outcome="failure">
         <redirect view-id="/version-group/request_to_join.xhtml" />
       </rule>
     </navigation>
     <navigation from-action="#{versionGroupJoinAction.cancel}">
-      <rule>
-        <redirect view-id="/version-group/version_group.xhtml">
-          <param name="versionGroupSlug"
-            value="#{versionGroupJoinAction.slug}" />
-        </redirect>
-      </rule>
+      <redirect view-id="/version-group/version_group.xhtml">
+        <param name="versionGroupSlug" value="#{versionGroupJoinAction.slug}" />
+      </redirect>
     </navigation>
   </page>
 
@@ -1118,9 +1114,12 @@
     <http-error error-code="503" />
   </exception>
 
-  <exception class="javax.validation.ConstraintViolationException" log-level="debug">
+  <exception class="javax.validation.ConstraintViolationException"
+    log-level="debug">
     <redirect view-id="/error.xhtml">
-      <message severity="warn">#{messages['jsf.Error']} #{org.jboss.seam.handledException.message}</message>
+      <message
+        severity="warn">#{messages['jsf.Error']} #{org.jboss.seam.handledException.message}
+      </message>
     </redirect>
   </exception>
 

diff --git a/zanata-war/src/main/webapp/iteration/request_to_join_group.xhtml b/zanata-war/src/main/webapp/iteration/request_to_join_group.xhtml
@@ -1,23 +1,16 @@
 <!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:s="http://jboss.org/schema/seam/taglib"
   xmlns:ui="http://java.sun.com/jsf/facelets"
-  xmlns:f="http://java.sun.com/jsf/core"
-  xmlns:h="http://java.sun.com/jsf/html"
-  xmlns:a4j="http://richfaces.org/a4j"
-  xmlns:rich="http://richfaces.org/rich"
   template="/WEB-INF/template/template_2x.xhtml">
 
   <ui:param name="showGlobalMessages" value="true"/>
 
   <ui:define
-    name="page_title">#{messages['jsf.RequestAddProjectToGroup']}</ui:define>
+    name="page_title">#{messages['jsf.RequestJoinGroup']}</ui:define>
 
   <ui:define name="center_content">
-
     <ui:include src="../WEB-INF/layout/version-group/request_join.xhtml"/>
-
   </ui:define>
 
 </ui:composition>
diff --git a/zanata-war/src/main/webapp/version-group/request_to_join.xhtml b/zanata-war/src/main/webapp/version-group/request_to_join.xhtml
@@ -7,11 +7,10 @@
   <ui:param name="showGlobalMessages" value="true"/>
 
   <ui:define
-    name="page_title">#{messages['jsf.RequestToJoinVersionGroup']}</ui:define>
+    name="page_title">#{messages['jsf.RequestJoinGroup']}</ui:define>
 
   <ui:define name="center_content">
     <ui:include src="../WEB-INF/layout/version-group/request_join.xhtml"/>
-
   </ui:define>
 
 </ui:composition>