Merge pull request #11 from nicolasmoreau/master

Lock button once species have been selected in form
misdoro · Apr 15, 2015 · 52d887b · 52d887b
2 parents 2c5a068 + 52092db
commit 52d887b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/...b/src/main/java/org/vamdc/portal/session/queryBuilder/formsTree/SpeciesSelectionForm.java b/...b/src/main/java/org/vamdc/portal/session/queryBuilder/formsTree/SpeciesSelectionForm.java
@@ -88,31 +88,25 @@ public void setMaxElementCount(Integer maxElementCount) {
 
 	@Override
 	public String getTitle() {
-		// TODO Auto-generated method stub
 		return null;
 	}
 
 	@Override
 	public Integer getOrder() {
-		// TODO Auto-generated method stub
 		return Order.GuidedSpeciesType;
 	}	
 
-	/*public Integer getPosition() {
-		// TODO Auto-generated method stub
-		return Order.Others;
-	}*/
-
 	@Override
 	public Boolean getQueryable() {
-		// TODO Auto-generated method stub
-		return true;
-		//return queryable;
+		return queryable;
 	}
 
 	public void setQueryable(Boolean queryable) {
-		// TODO Auto-generated method stub
 		this.queryable = queryable;
 	}
+
+	public void enable(){
+		this.setQueryable(true);
+	}
 
 }
diff --git a/portal.war/src/main/webapp/xhtml/query/queryTree/speciesSelectionForm.xhtml b/portal.war/src/main/webapp/xhtml/query/queryTree/speciesSelectionForm.xhtml
@@ -39,8 +39,11 @@
 					</c:forEach>
 				</h:selectOneMenu>
 
-				<a4j:commandButton value="Validate ->" align="right" width="200" action="#{form.validate}" id="speciesNextButton"
-				styleClass="roundButton" tabindex="20" reRender="formPanel" rendered="#{form.queryable}"/>
+				<a4j:commandButton value="Next ->" align="right" width="200" action="#{form.validate}" id="speciesNextButton"
+				styleClass="roundButton" tabindex="20" reRender="formPanel" disabled="#{!form.queryable}"/>
+
+				<a4j:commandButton value="Edit" align="right" width="200" action="#{form.enable}" id="speciesUnlockButton"
+				styleClass="roundButton" tabindex="20" reRender="formPanel" rendered="#{!form.queryable}"/>
 
 			</h:panelGrid>
 		</a4j:form>