Revert "TRUNK-3850"

This reverts commit 956e3f5.
openmrs · Feb 17, 2014 · 0e15769 · 0e15769
1 parent 9f8c016
commit 0e15769
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/api/src/main/java/org/openmrs/validator/ProgramValidator.java b/api/src/main/java/org/openmrs/validator/ProgramValidator.java
@@ -61,12 +61,14 @@ public void validate(Object obj, Errors errors) {
 		} else {
 			ValidationUtils.rejectIfEmptyOrWhitespace(errors, "name", "error.name");
 			ValidationUtils.rejectIfEmptyOrWhitespace(errors, "description", "error.description.required");
-			Program program = Context.getProgramWorkflowService().getProgramByName(p.getName());
-			if (program != null && !program.equals(p)) {
-				errors.rejectValue("name", "general.error.nameAlreadyInUse");
-
-			} else {
-				Context.evictFromSession(program);
+			List<Program> programs = Context.getProgramWorkflowService().getAllPrograms(false);
+			for (Program program : programs) {
+				if (program.getName().equals(p.getName()) && !program.getProgramId().equals(p.getProgramId())) {
+					errors.rejectValue("name", "general.error.nameAlreadyInUse");
+					break;
+				} else {
+					Context.evictFromSession(program);
+				}
 			}
 
 			ValidationUtils.rejectIfEmptyOrWhitespace(errors, "concept", "error.concept");