dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2612
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2011-01-18 11:16:22 +0100
message:
  Fixed issue with expression in validation result in data entry
modified:
  dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/validationResult.vm


--
lp:dhis2
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

=== 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	2010-12-29 21:08:09 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/validationResult.vm	2011-01-18 10:16:22 +0000
@@ -25,7 +25,7 @@
             #set ( $rightFormula = $rightsideFormulaMap.get( $id ) )
             <tr>
                 <td style="height:32px"#alternate( $mark )>$encoder.htmlEncode( $result.validationRule.name )</td>
-                <td#alternate( $mark )>$!encoder.htmlEncode( $leftFormula ) $i18n.getString( $result.validationRule.operator ) $!encoder.htmlEncode( $rightFormula )</td>
+                <td#alternate( $mark )>$!encoder.htmlEncode( $leftFormula ) $i18n.getString( $result.validationRule.operator.mathematicalOperator ) $!encoder.htmlEncode( $rightFormula )</td>
                 <td#alternate( $mark )>$!encoder.htmlEncode( $result.validationRule.leftSide.description )</td>
                 <td#alternate( $mark )>$result.leftsideValue</td>
                 <td#alternate( $mark )>$encoder.htmlEncode( $i18n.getString( $result.validationRule.operator.mathematicalOperator ) )</td>