dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 133
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Tue 2009-03-31 11:55:04 +0200
message:
  dhis-web-dataentry: Fixed bug related to validation of input form
modified:
  dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/xwork.xml
  dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/validationResult.vm

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/xwork.xml'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/xwork.xml	2009-03-09 19:32:51 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/xwork.xml	2009-03-31 09:55:04 +0000
@@ -202,14 +202,15 @@
     </action>
     
     <action name="validate" class="org.hisp.dhis.de.action.ValidationAction">
-      <interceptor-ref name="transactionStack"/>
       <result name="success" type="velocity">/popup.vm</result>
+      <result name="none" type="velocity">/popup.vm</result>
       <param name="page">/dhis-web-dataentry/validationResult.vm</param>
+      <interceptor-ref name="transactionStack"/>
     </action>
     
     <action name="getValidationViolations" class="org.hisp.dhis.de.action.ValidationAction">
+      <result name="success" type="velocity-xml">/dhis-web-dataentry/responseSuccess.vm</result>
       <result name="none" type="velocity-xml">/dhis-web-dataentry/responseNone.vm</result>
-      <result name="success" type="velocity-xml">/dhis-web-dataentry/responseSuccess.vm</result>
     </action>
     
   </package>

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/validationResult.vm'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/validationResult.vm	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/validationResult.vm	2009-03-31 09:55:04 +0000
@@ -1,9 +1,9 @@
-<h1>$encoder.htmlEncode( $i18n.getString( "validation_result" ) )</h1>
+<h3>$encoder.htmlEncode( $i18n.getString( "validation_result" ) )</h3>
 
 #if( $results.size() == 0)
-	<h3>$encoder.htmlEncode( $i18n.getString( "successful_validation" ) )</h3>
+	<p><b>$encoder.htmlEncode( $i18n.getString( "successful_validation" ) )</b></p>
 #else
-	<p>$encoder.htmlEncode( $i18n.getString( "unsuccessful_validation" ) )</p>
+	<p><b>$encoder.htmlEncode( $i18n.getString( "unsuccessful_validation" ) )</b></p>
 	<table width="100%">
 		<thead>
 			<tr>



--
Trunk
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription.