=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/ValidateTabularReportAction.java' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/ValidateTabularReportAction.java 2012-03-12 07:03:27 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/ValidateTabularReportAction.java 2012-03-12 07:24:12 +0000 @@ -89,11 +89,13 @@ if ( selectedOrgunit == null ) { message = i18n.getString( "please_specify_an_orgunit" ); + return INPUT; } if ( selectedOrgunit != null && facilityLB.equals( "childrenOnly" ) && !selectedOrgunit.hasChild() ) { message = i18n.getString( "selected_orgunit_no_have_any_child" ); + return INPUT; } return SUCCESS; === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/tabularReport.js' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/tabularReport.js 2012-03-12 07:03:27 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/tabularReport.js 2012-03-12 07:24:12 +0000 @@ -163,7 +163,10 @@ function validateTabularReport() { - $.post( 'validateTabularReport.action',{} + $.post( 'validateTabularReport.action', + { + facilityLB: getFieldValue('facilityLB') + } , function( json ) { if( json.response == 'success' ) @@ -172,7 +175,7 @@ } else { - setMessage( json.messsage ); + setMessage( json.message ); } } ); } === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/tabularReportSelect.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/tabularReportSelect.vm 2012-03-12 07:03:27 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/tabularReportSelect.vm 2012-03-12 07:24:12 +0000 @@ -1,7 +1,7 @@