← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 20452: Program indicator list, fix

 

------------------------------------------------------------
revno: 20452
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2015-10-01 18:46:42 +0200
message:
  Program indicator list, fix
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicator.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programRule.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-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicator.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicator.vm	2014-10-15 04:17:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicator.vm	2015-10-01 16:46:42 +0000
@@ -52,10 +52,10 @@
 				<tbody id="list">
 				#foreach( $indicator in $indicators )
 				<tr id="tr${indicator.id}" data-id="$!indicator.id" data-uid="$!indicator.uid" data-type="Indicator" data-name="$encoder.htmlEncode( $!indicator.displayName )"
-            data-can-manage="$security.canManage( $indicator )"
-            data-can-update="$security.canUpdate( $indicator )"
-            data-can-delete="$security.canDelete( $indicator )">
-          <td>$encoder.htmlEncode( $!indicator.displayName )</td>
+                    data-can-manage="$security.canManage( $indicator )"
+                    data-can-update="$security.canUpdate( $indicator )"
+                    data-can-delete="$security.canDelete( $indicator )">
+                    <td>$encoder.htmlEncode( $!indicator.displayName )</td>
 				</tr>
 				#end
 				</tbody>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programRule.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programRule.vm	2015-05-12 08:49:50 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programRule.vm	2015-10-01 16:46:42 +0000
@@ -49,8 +49,8 @@
                 data-can-manage="$security.canManage( $programRule )"
                 data-can-update="$security.canUpdate( $programRule )"
                 data-can-delete="$security.canDelete( $programRule )">
-                <td>$encoder.htmlEncode( $!programRule.displayName )</td>
-                <td>$encoder.htmlEncode( $!programRule.description )</td>
+                <td>$!encoder.htmlEncode( $!programRule.displayName )</td>
+                <td>$!encoder.htmlEncode( $!programRule.description )</td>
             </tr>
           #end