dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 6031
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-02-17 17:17:14 +0100
message:
  Case entry minor fix
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.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-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm	2012-02-17 15:48:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm	2012-02-17 16:17:14 +0000
@@ -77,12 +77,7 @@
 				##data element name
 				<td class='text-column'>
 					<span id="value[$programStageDataElement.dataElement.id].name" title="$!encoder.htmlEncode( $programStageDataElement.dataElement.description )">
-						#if( $!programStageDataElement.dataElement.formName )
-							$encoder.htmlEncode( $programStageDataElement.dataElement.formName ) 
-						#else
-							$encoder.htmlEncode( $programStageDataElement.dataElement.name ) 
-						#end
-						
+						$encoder.htmlEncode( $programStageDataElement.dataElement.formNameFallback )						
 						#if ( $programStageDataElement.compulsory )
 							<em title="$i18n.getString( "required" )" class="required">*</em>
 						#end