Merge pull request #20 from safrant/master

Add "other" to list of assay types
CBIIT · Jun 22, 2018 · d5fa999 · d5fa999
2 parents f8df1a2 + 58e19b1
commit d5fa999
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/software/cananolab-webapp/src/gov/nih/nci/cananolab/restful/CharacterizationServices.java b/software/cananolab-webapp/src/gov/nih/nci/cananolab/restful/CharacterizationServices.java
@@ -159,7 +159,10 @@ public Response getAssayTypesByCharName(@Context HttpServletRequest httpRequest,
 			CharacterizationManager characterizationMgr = (CharacterizationManager) SpringApplicationContext.getBean(httpRequest, "characterizationManager");
 
 			List<String> assayTypes = characterizationMgr.getAssayTypes(httpRequest, charName);
-
+			logger.debug("retrieved assayTypes");
+			if(!assayTypes.contains("other")){
+				assayTypes.add("other");
+			}
 			return Response.ok(assayTypes).header("Access-Control-Allow-Credentials", "true")
 					.header("Access-Control-Allow-Origin", "*").header("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, OPTIONS")
 					.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept, Authorization").build();