dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2225
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2010-11-29 18:00:23 +0100
message:
  Merged r 2075 from 2.0.5
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/responseDataIntegrity.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/GetIndicatorListAction.java


--
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-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/responseDataIntegrity.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/responseDataIntegrity.vm	2010-08-09 09:06:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/responseDataIntegrity.vm	2010-11-29 17:00:23 +0000
@@ -1,18 +1,18 @@
 #macro( violation $name $list )
 #set( $size = $list.size() )
-"${name}": [
+"$!encoder.jsEncode( ${name} )": [
 #foreach( $o in $list )
-"${o.name}"#if( $velocityCount < $size ),#end
+"$!encoder.jsEncode( ${o.name} )"#if( $velocityCount < $size ),#end
 #end
 ]
 #end
 
 #macro( violationWithCollection $name $list )
 #set( $listSize = $list.size() )
-"${name}": [
+"$!encoder.jsEncode( ${name} )": [
 #foreach( $o in $list )
 #set( $oSize = $o.size() )
-"#foreach( $p in $o ) ${p.name} #if( $velocityCount < $oSize ), #end
+"#foreach( $p in $o ) $!encoder.jsEncode( ${p.name} ) #if( $velocityCount < $oSize ), #end
 #end "#if( $velocityCount < $listSize ),#end
 #end
 ]
@@ -20,19 +20,19 @@
 
 #macro( violationWithMap $name $map )
 #set( $size = $map.keySet().size() )
-"${name}": [
+"$!encoder.jsEncode( ${name} )": [
 #foreach( $o in $map.keySet() )
-"${o.name}: $map.get( $o )"#if( $velocityCount < $size ),#end
+"$!encoder.jsEncode( ${o.name} ): $map.get( $o )"#if( $velocityCount < $size ),#end
 #end
 ]
 #end
 
 #macro( violationWithMapList $name $map )
 #set( $mapSize = $map.keySet().size() )
-"${name}": [
+"$!encoder.jsEncode( ${name} )": [
 #foreach( $o in $map.keySet() )
 #set( $listSize = $map.get( $o ).size() )
-"${o.name}:#foreach( $p in $map.get( $o ) ) ${p.name}#if( $velocityCount < $listSize ), #end
+"$!encoder.jsEncode( ${o.name} ):#foreach( $p in $map.get( $o ) ) $!encoder.jsEncode( ${p.name} )#if( $velocityCount < $listSize ), #end
 #end "#if( $velocityCount < $mapSize ),#end
 #end
 ]

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/GetIndicatorListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/GetIndicatorListAction.java	2010-11-27 07:46:29 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/GetIndicatorListAction.java	2010-11-29 17:00:23 +0000
@@ -148,7 +148,6 @@
     // Action implemantation
     // -------------------------------------------------------------------------
 
-    @SuppressWarnings( "unchecked" )
     public String execute()
     {
         if ( dataDictionaryId == null ) // None, get current data dictionary