=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataApprovalForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataApprovalForm.vm 2014-04-02 15:49:34 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataApprovalForm.vm 2014-04-02 16:07:27 +0000
@@ -81,11 +81,6 @@
-
-
-
-
-
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataSetReport.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataSetReport.js 2014-04-02 15:49:34 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataSetReport.js 2014-04-02 16:07:27 +0000
@@ -19,7 +19,6 @@
var dataSetReport = {
ds: ds,
- cc: dhis2.dsr.metaData.dataSets[ds].categoryCombo,
periodType: $( "#periodType" ).val(),
pe: $( "#periodId" ).val(),
ou: selectionTreeSelection.getSelectedUid()[0],
@@ -300,17 +299,6 @@
"&pe=" + dataSetReport.pe +
"&ou=" + dataSetReport.ou;
- if ( dataSetReport.cc && dataSetReport.cp && dataSetReport.cp.length > 0 ) {
- url += "&cc=" + dataSetReport.cc;
- url += "&cp=";
-
- $.each( dataSetReport.cp, function( idx, item ) {
- url += item + ";";
- } );
-
- url = url.slice( 0, -1 );
- }
-
return url;
}
@@ -324,17 +312,6 @@
"&pe=" + dataSetReport.pe +
"&ou=" + dataSetReport.ou;
- if ( dataSetReport.cc && dataSetReport.cp && dataSetReport.cp.length > 0 ) {
- url += "&cc=" + dataSetReport.cc;
- url += "&cp=";
-
- $.each( dataSetReport.cp, function( idx, item ) {
- url += item + ";";
- } );
-
- url = url.slice( 0, -1 );
- }
-
return url;
}