=== 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-01-08 13:16:30 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js 2015-02-09 08:49:33 +0000
@@ -219,13 +219,26 @@
{
console.log( 'Ouwt loaded' );
- $.when( dhis2.de.loadMetaData(), dhis2.de.loadDataSetAssociations() ).done( function() {
+ $.when( dhis2.de.getMultiOrgUnitSetting(), dhis2.de.loadMetaData(), dhis2.de.loadDataSetAssociations() ).done( function() {
dhis2.de.setMetaDataLoaded();
organisationUnitSelected( ids, names );
} );
} );
} );
+dhis2.de.getMultiOrgUnitSetting = function()
+{
+ return $.ajax({
+ url: '../api/systemSettings/multiOrganisationUnitForms',
+ dataType: 'json',
+ async: false,
+ type: 'GET',
+ success: function( data ) {
+ selection.setIncludeChildren(data);
+ }
+ });
+};
+
dhis2.de.ajaxLogin = function()
{
$( '#login_button' ).bind( 'click', function()
@@ -299,7 +312,7 @@
} );
return def.promise();
-}
+};
dhis2.de.setMetaDataLoaded = function()
{
@@ -308,7 +321,7 @@
console.log( 'Meta-data loaded' );
updateForms();
-}
+};
dhis2.de.discardLocalData = function() {
if( confirm( i18n_remove_local_data ) ) {
@@ -2157,6 +2170,7 @@
.done( function() {
dhis2.availability.startAvailabilityCheck();
console.log( 'Started availability check' );
+ selection.responseReceived();
} );
}
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/menu.vm'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/menu.vm 2013-12-21 19:13:26 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/menu.vm 2015-02-09 08:49:33 +0000
@@ -1,23 +1,11 @@