Fix edit version page with AS7

zanata · May 17, 2013 · 7fd29fd · 7fd29fd
1 parent 5a60eaf
commit 7fd29fd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java b/zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
@@ -26,6 +26,7 @@
 
 import javax.ws.rs.core.EntityTag;
 
+import org.apache.commons.lang.StringUtils;
 import org.hibernate.Criteria;
 import org.hibernate.Query;
 import org.hibernate.Session;
@@ -72,7 +73,7 @@ public HProjectIteration getBySlug(String projectSlug, String iterationSlug)
 
    public HProjectIteration getBySlug(HProject project, String iterationSlug)
    {
-      if( project == null )
+      if( project == null || StringUtils.isEmpty(iterationSlug))
       {
          return null;
       }

diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/iteration_edit_form.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/iteration_edit_form.xhtml
@@ -27,12 +27,12 @@
                 <f:selectItems value="#{projectIterationHome.projectTypeList}"/>
             </h:selectOneMenu>
             <s:span styleClass="icon-info-circle-2 input_help" id="projectTypeHelp">
-                <rich:toolTip>
+                <rich:tooltip>
                    #{messages['jsf.projectType.Description']}<br/>
                    #{messages['jsf.projectType.NotSpecifiedBehaviour']}<br/>
                    <br/>
                    <em>#{messages['jsf.projectType.MoreInfo']}</em><br/>
-                </rich:toolTip>
+                </rich:tooltip>
             </s:span>
         </s:decorate>
 
@@ -86,19 +86,18 @@
 	<s:div>
 		<a4j:region>
 			<h:selectBooleanCheckbox id="validationOptions" value="#{versionValidationOptionsAction.versionOverrideValidations}" >
-				<a4j:support event="onchange" reRender="validationOptionsList" />
+				<a4j:ajax event="change" render="validationOptionsList" />
 			</h:selectBooleanCheckbox>
 		</a4j:region>
 		<h:outputText value="#{messages['jsf.customizedValidationMessage']}"/>
 	</s:div>
 
 
 	<s:div id="validationOptionsList">
-	<rich:spacer height="20px" />
 		 <rich:dataGrid value="#{versionValidationOptionsAction.validationList}" var="validationAction" columns="1"
                          rendered="#{versionValidationOptionsAction.versionOverrideValidations}">
               <h:selectBooleanCheckbox value="#{versionValidationOptionsAction.selectedValidations[validationAction.id.name()]}">
-              	<a4j:support event="onchange" action="#{versionValidationOptionsAction.checkExclusive(validationAction)}" reRender="validationOptionsList"/>
+              	<a4j:ajax event="change" listener="#{versionValidationOptionsAction.checkExclusive(validationAction)}" render="validationOptionsList"/>
               </h:selectBooleanCheckbox>
               <h:outputLabel value="#{validationAction.id.displayName}"/>
               <h:outputLabel value="#{validationAction.description}" style="float:right;margin-right:20px;"/>