=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/entry.js'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/entry.js 2011-06-23 08:20:44 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/entry.js 2011-06-24 22:42:47 +0000
@@ -62,10 +62,7 @@
for ( k in matcher )
{
var match = matcher[k];
- var operand = match.replace( /[\[\]]/g, '' ); // Remove brackets from
- // expression to
- // simplify extraction
- // of identifiers
+ var operand = match.replace( /[\[\]]/g, '' ); // Remove brackets from expression to simplify extraction of identifiers
var dataElementId = operand.substring( 0, operand.indexOf( SEPARATOR ) );
var categoryOptionComboId = operand.substring( operand.indexOf( SEPARATOR ) + 1, operand.length );
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml 2011-06-23 14:36:02 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml 2011-06-24 22:42:47 +0000
@@ -128,7 +128,6 @@
displayViewReportForm.action
- F_REPORT_VIEW
@@ -137,7 +136,6 @@
/dhis-web-reporting/viewReportForm.vm
/dhis-web-reporting/menu.vm
javascript/report.js
- F_REPORT_VIEW
../dhis-web-commons/paging/paging.css
@@ -185,7 +183,6 @@
/dhis-web-reporting/inputReportParamsForm.vm
/dhis-web-reporting/menu.vm
../dhis-web-commons/oust/oust.js,javascript/generateReport.js
- F_REPORT_VIEW