dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 14917
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2014-04-20 18:15:45 +0200
message:
  Minor
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ouwt/ouwt.js
  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-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	2014-04-11 11:43:13 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ouwt/ouwt.js	2014-04-20 16:15:45 +0000
@@ -146,7 +146,7 @@
     };
 
     this.getVersion = function() {
-        if(dhis2.ou.memoryOnly) {
+        if ( dhis2.ou.memoryOnly ) {
             return -1;
         }
 

=== 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-16 15:56:13 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataApproval.js	2014-04-20 16:15:45 +0000
@@ -4,6 +4,10 @@
 dhis2.appr.currentPeriodOffset = 0;
 dhis2.appr.permissions = null;
 
+$( function() {
+	dhis2.appr.displayCategoryOptionGroups();
+} );
+
 //------------------------------------------------------------------------------
 // Report
 //------------------------------------------------------------------------------
@@ -15,7 +19,7 @@
 
 dhis2.appr.orgUnitSelected = function( orgUnits, orgUnitNames, children )
 {
-	dhis2.appr.displayCategoryOptionGroups( orgUnits[0] );
+	dhis2.appr.displayCategoryOptionGroups();
 }
 
 dhis2.appr.displayPeriods = function()
@@ -39,8 +43,10 @@
     dhis2.appr.displayPeriods();
 }
 
-dhis2.appr.displayCategoryOptionGroups = function( ou )
+dhis2.appr.displayCategoryOptionGroups = function()
 {
+	var ou = selection.getSelected()[0];
+	
 	if ( !ou ) {
 		return;
 	}