=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ouwt/ouwt.js' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ouwt/ouwt.js 2012-06-29 15:11:05 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ouwt/ouwt.js 2012-06-29 15:31:11 +0000 @@ -97,6 +97,11 @@ organisationUnits = JSON.parse( localStorage["organisationUnits"] ); + if(sessionStorage["organisationUnits"] !== undefined) + { + $.extend(organisationUnits, JSON.parse( sessionStorage["organisationUnits"] )) + } + selection.sync(); subtree.reloadTree(); @@ -648,6 +653,15 @@ function ( data, textStatus, jqXHR ) { // load additional organisationUnits into sessionStorage + if(sessionStorage["organisationUnits"] === undefined) + { + sessionStorage["organisationUnits"] = JSON.stringify( data.organisationUnits ); + } else { + units = JSON.parse( sessionStorage["organisationUnits"] ); + $.extend(units, data.organisationUnits); + sessionStorage["organisationUnits"] = JSON.stringify( units ); + } + $.extend(organisationUnits, data.organisationUnits); createChildren( parentTag, parent ); }