TRUNK-3882 Custom tag to render errors

(cherry picked from commit be50e0d)
openmrs · Mar 17, 2014 · 4227c8b · 4227c8b
1 parent 6ad9d86
commit 4227c8b
Show file tree

Hide file tree

Showing 19 changed files with 30 additions and 114 deletions.
diff --git a/webapp/src/main/webapp/WEB-INF/tags/errorNotify.tag b/webapp/src/main/webapp/WEB-INF/tags/errorNotify.tag
@@ -0,0 +1,11 @@
+<%@ include file="/WEB-INF/template/include.jsp" %>
+
+<%@ attribute name="errors" required="true" type="org.springframework.validation.Errors" %>
+
+<openmrs:message code="fix.error"/>
+<div class="error">
+    <c:forEach items="${errors.allErrors}" var="error">
+        <openmrs:message code="${error.code}" text="${error.code}"/><br/>
+    </c:forEach>
+</div>
+<br />
diff --git a/webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptReferenceTermForm.jsp b/webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptReferenceTermForm.jsp
@@ -111,13 +111,7 @@ $j(document).ready( function() {
 </c:if>
 
 <spring:hasBindErrors name="conceptReferenceTermModel">
-	<openmrs:message code="fix.error"/>
-	<div class="error">
-		<c:forEach items="${errors.allErrors}" var="error">
-			<openmrs:message code="${error.code}" text="${error.code}"/><br/>
-		</c:forEach>
-	</div>
-	<br />
+    <openmrs_tag:errorNotify errors="${errors}" />
 </spring:hasBindErrors>
 
 <form:form method="post" action="conceptReferenceTerm.form" modelAttribute="conceptReferenceTermModel">

diff --git a/webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptStopWordForm.jsp b/webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptStopWordForm.jsp
@@ -10,7 +10,7 @@
 <h2><openmrs:message code="ConceptStopWord.title"/></h2>
 
 <spring:hasBindErrors name="command">
-    <openmrs:message code="fix.error"/><br/>    
+    <openmrs:message code="fix.error"/><br/>
 </spring:hasBindErrors>
 
 <form method="post">

diff --git a/webapp/src/main/webapp/WEB-INF/view/admin/encounters/encounterForm.jsp b/webapp/src/main/webapp/WEB-INF/view/admin/encounters/encounterForm.jsp
@@ -219,13 +219,7 @@
 <h2><openmrs:message code="Encounter.manage.title"/></h2>
 
 <spring:hasBindErrors name="encounter">
-	<openmrs:message code="fix.error"/>
-	<div class="error">
-		<c:forEach items="${errors.allErrors}" var="error">
-			<openmrs:message code="${error.code}" text="${error.code}"/><br/>
-		</c:forEach>
-	</div>
-	<br />
+    <openmrs_tag:errorNotify errors="${errors}" />
 </spring:hasBindErrors>
 
 <b class="boxHeader"><openmrs:message code="Encounter.summary"/></b>
@@ -504,4 +498,4 @@
 
 </c:if>
 
-<%@ include file="/WEB-INF/template/footer.jsp" %>
+<%@ include file="/WEB-INF/template/footer.jsp" %>
diff --git a/webapp/src/main/webapp/WEB-INF/view/admin/forms/formEditForm.jsp b/webapp/src/main/webapp/WEB-INF/view/admin/forms/formEditForm.jsp
@@ -8,12 +8,7 @@
 <h2><openmrs:message code="Form.edit.title"/></h2>
 
 <spring:hasBindErrors name="form">
-	<openmrs:message code="fix.error"/>
-	<div class="error">
-		<c:forEach items="${errors.allErrors}" var="error">
-			<openmrs:message code="${error.code}" text="${error.code}"/><br/><!-- ${error} -->
-		</c:forEach>
-	</div>
+    <openmrs_tag:errorNotify errors="${errors}" />
 </spring:hasBindErrors>
 
 <c:if test="${form.retired}">

diff --git a/webapp/src/main/webapp/WEB-INF/view/admin/locations/locationForm.jsp b/webapp/src/main/webapp/WEB-INF/view/admin/locations/locationForm.jsp
@@ -25,13 +25,7 @@
 </c:if>
 
 <spring:hasBindErrors name="location">
-	<openmrs:message code="fix.error"/>
-	<div class="error">
-		<c:forEach items="${errors.globalErrors}" var="error">
-			<openmrs:message code="${error.defaultMessage}" text="${error.defaultMessage}"/><br/><!-- ${error} -->
-		</c:forEach>
-	</div>
-	<br />
+    <openmrs_tag:errorNotify errors="${errors}" />
 </spring:hasBindErrors>
 <form method="post">
 <fieldset>

diff --git a/webapp/src/main/webapp/WEB-INF/view/admin/observations/obsForm.jsp b/webapp/src/main/webapp/WEB-INF/view/admin/observations/obsForm.jsp
@@ -217,13 +217,7 @@
 <h2><openmrs:message code="Obs.title"/></h2>
 
 <spring:hasBindErrors name="obs">
-	<openmrs:message code="fix.error"/>
-	<div class="error">
-		<c:forEach items="${errors.globalErrors}" var="error">
-			<openmrs:message code="${error.defaultMessage}" text="${error.defaultMessage}"/><br/><!-- ${error} -->
-		</c:forEach>
-	</div>
-	<br/>
+    <openmrs_tag:errorNotify errors="${errors}" />
 </spring:hasBindErrors>
 
 <c:if test="${obs.voided}">

diff --git a/webapp/src/main/webapp/WEB-INF/view/admin/patients/mergePatientsForm.jsp b/webapp/src/main/webapp/WEB-INF/view/admin/patients/mergePatientsForm.jsp
@@ -409,12 +409,7 @@ function generateMergeList(){
 </style>
 
 <spring:hasBindErrors name="patient">
-	<openmrs:message code="fix.error"/>
-	<div class="error">
-		<c:forEach items="${errors.allErrors}" var="error">
-			<openmrs:message code="${error.code}" text="${error.code}"/><br/><!-- ${error} -->
-		</c:forEach>
-	</div>
+    <openmrs_tag:errorNotify errors="${errors}" />
 </spring:hasBindErrors>
 
 <h2><openmrs:message code="Patient.merge.title"/></h2>

diff --git a/webapp/src/main/webapp/WEB-INF/view/admin/patients/patientForm.jsp b/webapp/src/main/webapp/WEB-INF/view/admin/patients/patientForm.jsp
@@ -286,12 +286,7 @@
 </openmrs:hasPrivilege>
 
 <spring:hasBindErrors name="patient">
-	<openmrs:message code="fix.error"/>
-	<div class="error">
-		<c:forEach items="${errors.allErrors}" var="error">
-			<openmrs:message code="${error.code}" text="${error.code}" arguments="${error.arguments}"/><br/><!-- ${fn:replace(error, '--', '\\-\\-')} -->
-		</c:forEach>
-	</div>
+    <openmrs_tag:errorNotify errors="${errors}" />
 </spring:hasBindErrors>
 
 <form method="post" onSubmit="removeBlankData()">

diff --git a/webapp/src/main/webapp/WEB-INF/view/admin/patients/shortPatientForm.jsp b/webapp/src/main/webapp/WEB-INF/view/admin/patients/shortPatientForm.jsp
@@ -221,12 +221,7 @@
 <openmrs:globalProperty key="use_patient_attribute.mothersName" defaultValue="false" var="showMothersName"/>
 
 <spring:hasBindErrors name="patientModel">
-	<openmrs:message code="fix.error"/>
-	<div class="error">
-		<c:forEach items="${errors.allErrors}" var="error">
-			<openmrs:message code="${error.code}" text="${error.code}" arguments="${error.arguments}"/><br/><!-- ${fn:replace(error, '--', '\\-\\-')} -->
-		</c:forEach>
-	</div>
+    <openmrs_tag:errorNotify errors="${errors}" />
 </spring:hasBindErrors>
 
 <form:form method="post" action="shortPatientForm.form" onsubmit="removeHiddenRows()" modelAttribute="patientModel">

diff --git a/webapp/src/main/webapp/WEB-INF/view/admin/person/personForm.jsp b/webapp/src/main/webapp/WEB-INF/view/admin/person/personForm.jsp
@@ -263,12 +263,7 @@
 </openmrs:hasPrivilege>
 
 <spring:hasBindErrors name="person">
-	<openmrs:message code="fix.error"/>
-	<div class="error">
-		<c:forEach items="${errors.allErrors}" var="error">
-			<openmrs:message code="${error.code}" text="${error.code}" arguments="${error.arguments}"/><br/><!-- ${fn:replace(error, '--', '\\-\\-')} -->
-		</c:forEach>
-	</div>
+    <openmrs_tag:errorNotify errors="${errors}" />
 </spring:hasBindErrors>
 
 <form method="post" onSubmit="removeBlankData()">

diff --git a/webapp/src/main/webapp/WEB-INF/view/admin/scheduler/schedulerForm.jsp b/webapp/src/main/webapp/WEB-INF/view/admin/scheduler/schedulerForm.jsp
@@ -142,13 +142,7 @@ window.onload = init;
 
 
 <spring:hasBindErrors name="concept">
-	<openmrs:message code="fix.error"/>
-	<div class="error">
-		<c:forEach items="${errors.allErrors}" var="error">
-			<openmrs:message code="${error.code}" text="${error.code}"/><br/><!-- ${error} -->
-		</c:forEach>
-	</div>
-	<br />
+    <openmrs_tag:errorNotify errors="${errors}" />
 </spring:hasBindErrors>
 
 <spring:hasBindErrors name="task">

diff --git a/webapp/src/main/webapp/WEB-INF/view/admin/users/alertForm.jsp b/webapp/src/main/webapp/WEB-INF/view/admin/users/alertForm.jsp
@@ -140,12 +140,7 @@
 <h2><openmrs:message code="Alert.manage.title"/></h2>	
 
 <spring:hasBindErrors name="alert">
-	<openmrs:message code="fix.error"/>
-	<div class="error">
-		<c:forEach items="${errors.allErrors}" var="error">
-			<openmrs:message code="${error.code}" text="${error.code}"/><br/><!-- ${error} -->
-		</c:forEach>
-	</div>
+    <openmrs_tag:errorNotify errors="${errors}" />
 </spring:hasBindErrors>
 
 <form method="post">

diff --git a/webapp/src/main/webapp/WEB-INF/view/admin/users/changePasswordForm.jsp b/webapp/src/main/webapp/WEB-INF/view/admin/users/changePasswordForm.jsp
@@ -16,13 +16,7 @@
 	</c:if>
 
 	<spring:hasBindErrors name="user">
-		<openmrs:message code="fix.error"/>
-		<div class="error">
-			<c:forEach items="${errors.allErrors}" var="error">
-				<openmrs:message code="${error.code}" text="${error.code}"/><br/><!-- ${error} -->
-			</c:forEach>
-		</div>
-		<br />
+        <openmrs_tag:errorNotify errors="${errors}" />
 	</spring:hasBindErrors>
 
 	<form id="thisChangePasswordForm" method="post" action="changePassword.form" autocomplete="off">

diff --git a/webapp/src/main/webapp/WEB-INF/view/admin/users/roleForm.jsp b/webapp/src/main/webapp/WEB-INF/view/admin/users/roleForm.jsp
@@ -34,12 +34,7 @@
 <h2><openmrs:message code="Role.manage.title"/></h2>	
 
 <spring:hasBindErrors name="role">
-	<openmrs:message code="fix.error"/>
-	<div class="error">
-		<c:forEach items="${errors.allErrors}" var="error">
-			<openmrs:message code="${error.code}" text="${error.code}"/><br/><!-- ${error} -->
-		</c:forEach>
-	</div>
+    <openmrs_tag:errorNotify errors="${errors}" />
 </spring:hasBindErrors>
 
 <form method="post">

diff --git a/webapp/src/main/webapp/WEB-INF/view/admin/users/userForm.jsp b/webapp/src/main/webapp/WEB-INF/view/admin/users/userForm.jsp
@@ -64,13 +64,7 @@
 </c:if>
 
 <spring:hasBindErrors name="user">
-	<openmrs:message code="fix.error"/>
-	<div class="error">
-		<c:forEach items="${errors.allErrors}" var="error">
-			<openmrs:message code="${error.code}" text="${error.code}"/><br/><!-- ${error} -->
-		</c:forEach>
-	</div>
-	<br />
+    <openmrs_tag:errorNotify errors="${errors}" />
 </spring:hasBindErrors>
 
 <form id="thisUserForm" method="post" action="user.form" autocomplete="off">

diff --git a/webapp/src/main/webapp/WEB-INF/view/admin/visits/visitForm.jsp b/webapp/src/main/webapp/WEB-INF/view/admin/visits/visitForm.jsp
@@ -104,13 +104,7 @@ $j(document).ready( function() {
 </style>
 
 <spring:hasBindErrors name="visit">
-	<openmrs:message code="fix.error"/>
-	<div class="error">
-		<c:forEach items="${errors.allErrors}" var="error">
-			<openmrs:message code="${error.code}" text="${error.code}" arguments="${error.arguments}"/><br/>
-		</c:forEach>
-	</div>
-	<br />
+    <openmrs_tag:errorNotify errors="${errors}" />
 </spring:hasBindErrors>
 
 <h2>

diff --git a/webapp/src/main/webapp/WEB-INF/view/dictionary/conceptForm.jsp b/webapp/src/main/webapp/WEB-INF/view/dictionary/conceptForm.jsp
@@ -134,13 +134,7 @@
 </c:if>
 
 <spring:hasBindErrors name="command">
-	<openmrs:message code="fix.error"/>
-	<div class="error">
-		<c:forEach items="${errors.allErrors}" var="error">
-			<openmrs:message code="${error.code}" text="${error.code}"/><br/><!-- ${error} -->
-		</c:forEach>
-	</div>
-	<br />
+    <openmrs_tag:errorNotify errors="${errors}" />
 </spring:hasBindErrors>
 
 <c:if test="${command.concept.conceptId != null}">

diff --git a/webapp/src/main/webapp/WEB-INF/view/optionsForm.jsp b/webapp/src/main/webapp/WEB-INF/view/optionsForm.jsp
@@ -121,13 +121,7 @@ function containsError(element) {
 <h2><openmrs:message code="options.title" /></h2>
 
 <spring:hasBindErrors name="opts">
-	<openmrs:message code="fix.error" />
-	<div class="error"><c:forEach items="${errors.allErrors}" var="error">
-		<openmrs:message code="${error.code}" text="${error.code}" />
-		<br />
-		<!-- ${error} -->
-	</c:forEach></div>
-	<br />
+    <openmrs_tag:errorNotify errors="${errors}" />
 </spring:hasBindErrors>
 
 <form method="post">