TRUNK-3956 ~ caught the DataIntegrityViolationException error

(cherry picked from commit 996ddca)
openmrs · Sep 12, 2013 · 3f05b49 · 3f05b49
1 parent 9a0012d
commit 3f05b49
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/web/src/main/java/org/openmrs/web/controller/form/FormFormController.java b/web/src/main/java/org/openmrs/web/controller/form/FormFormController.java
@@ -39,6 +39,7 @@
 import org.openmrs.web.WebConstants;
 import org.springframework.beans.propertyeditors.CustomNumberEditor;
 import org.springframework.context.support.MessageSourceAccessor;
+import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.validation.BindException;
 import org.springframework.validation.Errors;
 import org.springframework.web.bind.ServletRequestDataBinder;
@@ -108,6 +109,10 @@ protected ModelAndView onSubmit(HttpServletRequest request, HttpServletResponse
 						Context.getFormService().purgeForm(form);
 						httpSession.setAttribute(WebConstants.OPENMRS_MSG_ATTR, "Form.deleted");
 					}
+					catch (DataIntegrityViolationException e) {
+						httpSession.setAttribute(WebConstants.OPENMRS_ERROR_ATTR, "Form.cannot.delete");
+						return new ModelAndView(new RedirectView("formEdit.form?formId=" + form.getFormId()));
+					}
 					catch (Exception e) {
 						log.error("Error while deleting form " + form.getFormId(), e);
 						errors.reject(e.getMessage());