=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js' --- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js 2015-04-10 03:20:41 +0000 +++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js 2015-04-10 08:41:17 +0000 @@ -229,6 +229,24 @@ } ); } ); +dhis2.de.shouldFetchDataSets = function( ids ) { + if( !dhis2.de.multiOrganisationUnitEnabled ) { + return false; + } + + if( !$.isArray(ids) || ids.length == 0 ) { + return false; + } + + var c = organisationUnits[ids[0]].c; + + if( $.isArray(c) && c.length > 0 && dhis2.de.organisationUnitAssociationSetMap[c[0]] ) { + return false; + } + + return true; +}; + dhis2.de.getMultiOrgUnitSetting = function() { return $.ajax({