dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 20584
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2015-10-08 16:26:51 +0300
message:
  ER render fix.
modified:
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.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-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js	2015-10-03 12:51:50 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js	2015-10-08 13:26:51 +0000
@@ -7349,10 +7349,10 @@
                         ns.app.dateTotal = new Date();
 
                         // after render
-                        ns.app.layout = layout;
-                        ns.app.xLayout = xLayout;
-                        ns.app.response = response;
-                        ns.app.xResponse = xResponse;
+                        //ns.app.layout = layout;
+                        //ns.app.xLayout = xLayout;
+                        //ns.app.response = response;
+                        //ns.app.xResponse = xResponse;
                         ns.app.xColAxis = xColAxis;
                         ns.app.xRowAxis = xRowAxis;
                         ns.app.uuidDimUuidsMap = table.uuidDimUuidsMap;
@@ -7437,6 +7437,9 @@
                     getOptionSets(xResponse, getReport);
 				};
 
+                ns.app.layout = layout;
+                ns.app.response = response;
+
                 if (!response.rows.length) {
                     ns.app.centerRegion.removeAll(true);
                     ns.app.centerRegion.update('');