=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js 2010-12-06 04:38:50 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js 2010-12-06 22:38:32 +0000 @@ -1340,13 +1340,3 @@ { return isNumber( value ) && parseFloat( value ) == 0; } - -function getValueTrimById( valueId ) -{ - return getValueTrim( getFieldValue( valueId ) ); -} - -function getValueTrim( value ) -{ - return trim( value ).replace(/\s+/g, ' '); -} === modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/macros.vm' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/macros.vm 2010-12-06 04:38:50 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/macros.vm 2010-12-06 22:38:32 +0000 @@ -116,7 +116,7 @@ #macro( filterDiv $action ) $i18n.getString( "filter_by_name" ): -
+
#set ($value = $encoder.htmlEncode( ${key} ))