dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 14800
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2014-04-11 13:58:36 +0200
message:
  Minor
modified:
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataApprovalForm.vm
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataApproval.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-reporting/src/main/webapp/dhis-web-reporting/dataApprovalForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataApprovalForm.vm	2014-04-11 11:43:13 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataApprovalForm.vm	2014-04-11 11:58:36 +0000
@@ -1,4 +1,7 @@
 <script type="text/javascript">
+
+selection.setListenerFunction( dhis2.appr.orgUnitSelected  );
+
 var i18n_select_data_set = '$encoder.jsEscape( $i18n.getString( "select_data_set" ), "'")';
 var i18n_select_period = '$encoder.jsEscape( $i18n.getString( "select_period" ), "'")';
 var i18n_select_organisation_unit = '$encoder.jsEscape( $i18n.getString( "select_organisation_unit" ), "'")';

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataApproval.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataApproval.js	2014-04-11 11:43:13 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataApproval.js	2014-04-11 11:58:36 +0000
@@ -4,12 +4,6 @@
 dhis2.appr.currentPeriodOffset = 0;
 dhis2.appr.permissions = null;
 
-$( document ).ready( function()
-{
-	$( "body" ).on( "oust.selected", dhis2.appr.orgUnitSelected );
-} );
-
-
 //------------------------------------------------------------------------------
 // Report
 //------------------------------------------------------------------------------
@@ -19,9 +13,9 @@
 	dhis2.appr.displayPeriods();
 }
 
-dhis2.appr.orgUnitSelected = function( event, ou )
+dhis2.appr.orgUnitSelected = function( orgUnits, orgUnitNames, children )
 {
-	dhis2.appr.displayCategoryOptionGroups( ou );
+	dhis2.appr.displayCategoryOptionGroups( orgUnits[0] );
 }
 
 dhis2.appr.displayPeriods = function()