=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/databrowser/DataBrowserAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/databrowser/DataBrowserAction.java 2011-05-22 12:36:53 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/databrowser/DataBrowserAction.java 2011-05-23 04:39:20 +0000 @@ -29,7 +29,6 @@ import static org.hisp.dhis.system.util.TextUtils.nullIfEmpty; -import org.hisp.dhis.organisationunit.OrganisationUnit; import org.hisp.dhis.period.PeriodType; import org.hisp.dhis.system.util.DateUtils; import org.hisp.dhis.util.SessionUtils; @@ -69,7 +68,7 @@ .parseInt( selectedUnitChanger ) ) ); } - OrganisationUnit selectedUnit = selectionManager.getSelectedOrganisationUnit(); + selectedUnit = selectionManager.getSelectedOrganisationUnit(); // Checks if the selected unit is a leaf node of tree then // We must add parent as the same parameter value === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserForm.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserForm.vm 2011-04-05 06:02:03 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserForm.vm 2011-05-23 04:39:20 +0000 @@ -77,7 +77,7 @@
- #parse( "/dhis-web-commons/ouwt/orgunittree.vm" ) + #parse( "/dhis-web-commons/ouwt/orgunittree.vm" )
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/dataBrowserForm.js' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/dataBrowserForm.js 2011-04-11 12:08:16 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/dataBrowserForm.js 2011-05-23 04:39:20 +0000 @@ -4,7 +4,7 @@ datePickerInRange('fromDate', 'toDate'); validation2('databrowser', function(form) { - validateBeforeSubmit(); + validateBeforeSubmit(form); }, { 'rules' : getValidationRules("dataBrowser") });