Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 16086 [merge]
committer: Jan Henrik Overland <[email protected]>
branch nick: dhis2
timestamp: Fri 2014-07-11 14:36:22 +0200
message:
EV layout issue fixed.
modified:
dhis-2/dhis-web/dhis-web-event-visualizer/src/main/webapp/dhis-web-event-visualizer/app/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-event-visualizer/src/main/webapp/dhis-web-event-visualizer/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-event-visualizer/src/main/webapp/dhis-web-event-visualizer/app/scripts/app.js 2014-07-09 19:53:22 +0000
+++ dhis-2/dhis-web/dhis-web-event-visualizer/src/main/webapp/dhis-web-event-visualizer/app/scripts/app.js 2014-07-11 12:35:42 +0000
@@ -3321,7 +3321,7 @@
},
extendDim = function(dim) {
dim.id = dim.id || dim.dimension;
- dim.name = dim.name || ns.app.response.metaData.names[dim.dimension] || "Nissa";
+ dim.name = dim.name || ns.app.response.metaData.names[dim.dimension];
return dim;
};
@@ -4628,7 +4628,7 @@
var win = ns.app.viewport.getLayoutWindow();
if (selectedStore.getRange().length) {
- win.addDimension({id: dimension.id, name: dimension.name});
+ win.addDimension({id: dimension.id, name: dimension.name}, win.rowStore);
}
else if (!selectedStore.getRange().length && win.hasDimension(dimension.id)) {
win.removeDimension(dimension.id);
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
