TRUNK-4261: Error while submitting empty form in the page: "openmrs/a…

…dmin/concepts/conceptReferenceTerm.form" commit 3cb0f3c Author: Julius Duic <jpduic1@gmail.com> Date: Wed Jul 23 15:00:55 2014 -0400 Display multiple form errors when validating commit 6037cf3 Author: Marvin Yan <marvin.yan@outlook.com> Date: Wed Jul 23 14:06:51 2014 -0400 Add check for null ConceptSource
openmrs · Jul 23, 2014 · abdfcb0 · abdfcb0
1 parent 9d5e5bb
commit abdfcb0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/api/src/main/java/org/openmrs/validator/ConceptReferenceTermValidator.java b/api/src/main/java/org/openmrs/validator/ConceptReferenceTermValidator.java
@@ -75,14 +75,18 @@ public void validate(Object obj, Errors errors) throws APIException {
 		ConceptReferenceTerm conceptReferenceTerm = (ConceptReferenceTerm) obj;
 
 		String code = conceptReferenceTerm.getCode();
+		boolean hasBlankFields = false;
 		if (!StringUtils.hasText(code)) {
 			errors.rejectValue("code", "ConceptReferenceTerm.error.codeRequired",
 			    "The code property is required for a concept reference term");
-			return;
+			hasBlankFields = true;
 		}
 		if (conceptReferenceTerm.getConceptSource() == null) {
 			errors.rejectValue("conceptSource", "ConceptReferenceTerm.error.sourceRequired",
 			    "The conceptSource property is required for a concept reference term");
+			hasBlankFields = true;
+		}
+		if (hasBlankFields) {
 			return;
 		}
 

diff --git a/web/src/main/java/org/openmrs/web/controller/concept/ConceptReferenceTermWebValidator.java b/web/src/main/java/org/openmrs/web/controller/concept/ConceptReferenceTermWebValidator.java
@@ -15,6 +15,7 @@
 
 import org.openmrs.ConceptReferenceTerm;
 import org.openmrs.ConceptReferenceTermMap;
+import org.openmrs.ConceptSource;
 import org.openmrs.validator.ConceptReferenceTermValidator;
 import org.springframework.validation.Errors;
 import org.springframework.validation.Validator;
@@ -34,10 +35,10 @@ public boolean supports(Class<?> clazz) {
 	@Override
 	public void validate(Object target, Errors errors) {
 		ConceptReferenceTerm conceptReferenceTerm = (ConceptReferenceTerm) target;
-		if (conceptReferenceTerm.getConceptSource().getId() == null) {
+		ConceptSource conceptSource = conceptReferenceTerm.getConceptSource();
+		if (conceptSource != null && conceptSource.getId() == null) {
 			errors.rejectValue("conceptSource", "ConceptReferenceTerm.source.notInDatabase",
 			    "Only existing concept reference sources can be used");
-
 		}
 		if (conceptReferenceTerm.getConceptReferenceTermMaps() != null) {
 			int mapsIndex = 0;