dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 16817 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2014-09-25 16:34:42 +0200
message:
  ER EV tree rendering issue fixed.
modified:
  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-visualizer/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	2014-09-24 11:56:28 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js	2014-09-24 14:28:49 +0000
@@ -4778,6 +4778,10 @@
 				},
 				afterrender: function() {
 					this.getSelectionModel().select(0);
+                    
+                    Ext.defer(function() {
+                        data.expand();
+                    }, 20);
 				},
 				itemcontextmenu: function(v, r, h, i, e) {
 					v.getSelectionModel().select(r, false);
@@ -5574,7 +5578,7 @@
             expandInitPanels: function() {
                 organisationUnit.expand();
                 //period.expand();
-                data.expand();
+                //data.expand();
             },
 			map: layer ? layer.map : null,
 			layer: layer ? layer : null,

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js	2014-09-24 12:43:11 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js	2014-09-24 14:28:49 +0000
@@ -4399,6 +4399,10 @@
 				},
 				afterrender: function() {
 					this.getSelectionModel().select(0);
+                    
+                    Ext.defer(function() {
+                        data.expand();
+                    }, 20);
 				},
 				itemcontextmenu: function(v, r, h, i, e) {
 					v.getSelectionModel().select(r, false);
@@ -5190,7 +5194,7 @@
             expandInitPanels: function() {
                 organisationUnit.expand();
                 //period.expand();
-                data.expand();
+                //data.expand();
             },
 			map: layer ? layer.map : null,
 			layer: layer ? layer : null,