dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 21482
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2015-12-17 15:12:16 +0100
message:
  minor fix, use .getFormNameFallback() instead of .displayName for multiorg section forms
modified:
  dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/multiOrgSectionForm.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/multiOrgSectionForm.vm'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/multiOrgSectionForm.vm	2015-09-07 03:01:40 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/multiOrgSectionForm.vm	2015-12-17 14:12:16 +0000
@@ -37,7 +37,7 @@
     <tr>
         <td rowspan="$rowSpan"></td>
         #foreach( $dataElement in $section.dataElements )
-        <th colspan="$colCount">$dataElement.displayName</th>
+        <th colspan="$colCount">$dataElement.getFormNameFallback()</th>
         #end
     </tr>
 
@@ -154,7 +154,7 @@
         #set( $count = $count + 1 )
         #if( $isDefaultCategory )
         <tr>
-            <td rowspan="$colCount" #if( $mark == 1 )class="alt"#else class="reg"#end>${encoder.htmlEncode( $dataElement.displayName )}</td>
+            <td rowspan="$colCount" #if( $mark == 1 )class="alt"#else class="reg"#end>${encoder.htmlEncode( $dataElement.getFormNameFallback() )}</td>
 
             #foreach( $organisationUnit in $organisationUnits )
                 <span class="hidden" id="${dataElement.uid}-dataelement">${encoder.htmlEncode( $dataElement.getFormNameFallback() )}</span>
@@ -195,7 +195,7 @@
         #set( $categoryOptions2 = $optionsMap.get( $category2.id ) )
         <tr>
             #if( $velocityCount == 1 )
-                <td rowspan="$colCount" #if( $mark == 1 )class="alt"#else class="reg"#end>${encoder.htmlEncode( $dataElement.displayName )}</td>
+                <td rowspan="$colCount" #if( $mark == 1 )class="alt"#else class="reg"#end>${encoder.htmlEncode( $dataElement.getFormNameFallback() )}</td>
             #end
 
             #set( $catRowSpan = $colCount / 2)