=== 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 2014-09-02 20:08:51 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js 2014-09-02 20:33:43 +0000
@@ -112,7 +112,7 @@
*/
dhis2.de.on = function( event, fn )
{
- $( document ).off( event ).on( event, fn );
+ $( document ).off( event ).on( event, fn );
}
var EVENT_FORM_LOADED = "dhis-web-dataentry-form-loaded"; // Deprecated
@@ -828,14 +828,14 @@
multiDataSetValid = true;
}
- $( '' ).attr( 'data-multiorg', true ).attr( 'value', item.id).html(item.name).appendTo( '#selectedDataSetId' );
+ $( '' ).attr( 'data-multiorg', true ).attr( 'value', item.id).html( item.name ).appendTo( '#selectedDataSetId' );
} );
$( '#selectDataSetId' ).append( '' );
}
}
- if ( !dhis2.de.multiOrganisationUnit && dataSetValid && dataSetId != null ) {
+ if ( !dhis2.de.multiOrganisationUnit && dataSetValid && dataSetId ) {
$( '#selectedDataSetId' ).val( dataSetId ); // Restore selected data set
if ( dhis2.de.inputSelected() && dhis2.de.dataEntryFormIsLoaded ) {
@@ -844,12 +844,13 @@
loadDataValues();
}
}
- else if ( dhis2.de.multiOrganisationUnit && multiDataSetValid && dataSetId != null ) {
+ else if ( dhis2.de.multiOrganisationUnit && multiDataSetValid && dataSetId ) {
$( '#selectedDataSetId' ).val( dataSetId ); // Restore selected data set
dataSetSelected();
}
else {
dhis2.de.multiOrganisationUnit = false;
+ dhis2.de.currentDataSetId = null;
clearSectionFilters();
clearPeriod();