Merge pull request #24 from nicolasmoreau/master

remove Async queries and 'Transition to and from a given energy range…
VAMDC · Jul 9, 2015 · b417acf · b417acf
2 parents 09cc48f + 6fc2324
commit b417acf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/formsTree/RadiativeForm.java b/portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/formsTree/RadiativeForm.java
@@ -40,7 +40,7 @@ private enum NextForm{
 		private static final long serialVersionUID = 1L;
 		{
 			add(new SelectItem(NextForm.upperLowerEnergyRange,"Transition from an energy range to another one"));
-			add(new SelectItem(NextForm.stateEnergyRange,"Transition to and from a given energy range"));
+			//add(new SelectItem(NextForm.stateEnergyRange,"Transition to and from a given energy range"));
 			add(new SelectItem(NextForm.anyEnergyRange,"Any transition"));
 		}
 	};

diff --git a/portal.war/src/main/webapp/xhtml/query/formMenu.xhtml b/portal.war/src/main/webapp/xhtml/query/formMenu.xhtml
@@ -49,8 +49,8 @@
 						action="#{query.addFormBranches}" />
 					<rich:menuItem value="Comments" reRender="formPanel"
 						action="#{query.addFormComments}" />
-					<rich:menuItem value="Asynchronous request" reRender="formPanel"
-						action="#{query.addFormAsync}" />
+					<!-- <rich:menuItem value="Asynchronous request" reRender="formPanel"
+						action="#{query.addFormAsync}" />-->
 				</rich:dropDownMenu>
 
 			</a4j:form>