------------------------------------------------------------
revno: 21589
committer: Jan Henrik Overland <janhenrik.overl...@gmail.com>
branch nick: dhis2
timestamp: Tue 2016-01-05 14:43:20 +0100
message:
GIS event popup bug fixed.
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/core.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-mapping/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/core.js 2016-01-05 09:24:38 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/core.js 2016-01-05 13:43:20 +0000
@@ -665,7 +665,11 @@
});
}
- layer.widget.infrastructuralDataElementValuesStore.loadData(records);
+ var store = layer.widget.infrastructuralDataElementValuesStore;
+
+ if (store) {
+ store.loadData(records);
+ }
}
}
});
@@ -861,7 +865,7 @@
if (isEvent) {
defaultLeftClickSelect = function fn(feature) {
- var ignoreKeys = ['label', 'value', 'nameColumnMap', 'psi', 'ps', 'longitude', 'latitude', 'eventdate', 'ou', 'oucode', 'ouname', 'popupText'],
+ var ignoreKeys = ['id', 'label', 'value', 'nameColumnMap', 'psi', 'ps', 'longitude', 'latitude', 'eventdate', 'ou', 'oucode', 'ouname', 'popupText'],
attributes = feature.attributes,
map = attributes.nameColumnMap,
html = '<table class="padding1">',
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
