← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 19796: Dashboard filter, clear function, fixed bug

 

------------------------------------------------------------
revno: 19796
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2015-08-19 12:21:12 -0400
message:
  Dashboard filter, clear function, fixed bug
modified:
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dashboard.js


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dashboard.js'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dashboard.js	2015-08-06 13:27:58 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dashboard.js	2015-08-19 16:21:12 +0000
@@ -1246,7 +1246,7 @@
 dhis2.db.updateSelectedOrgUnits = function()
 {
 	var ous = selectionTreeSelection.getSelectedUid();
-	dhis2.db.currentUserOrgUnit = ous;	
+	dhis2.db.currentUserOrgUnit = ous;
 	dhis2.db.renderDashboard( dhis2.db.current() );
 	$( "#orgUnitSelectorForm" ).dialog( "destroy" );
 }
@@ -1255,5 +1255,6 @@
 {
 	dhis2.db.currentUserOrgUnit = [];
 	selectionTree.clearSelectedOrganisationUnitsAndBuildTree();
-	dhis2.db.updateSelectedOrgUnits();
+	dhis2.db.renderDashboard( dhis2.db.current() );
+	$( "#orgUnitSelectorForm" ).dialog( "destroy" );
 }