=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js' --- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js 2012-11-13 15:12:50 +0000 +++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js 2012-11-13 16:07:36 +0000 @@ -789,6 +789,7 @@ proxy: { type: 'ajax', url: '', + noCache: false, reader: { type: 'json', root: 'organisationUnitGroups' === modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/mapfish/widgets/geostat/Facility.js' --- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/mapfish/widgets/geostat/Facility.js 2012-11-10 15:09:47 +0000 +++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/mapfish/widgets/geostat/Facility.js 2012-11-13 16:07:36 +0000 @@ -191,9 +191,6 @@ value = cb.getValue(); this.config.extended.updateLegend = true; - - store.proxy.url = GIS.conf.url.path_gis + 'getOrganisationUnitGroupsByGroupSet.action?id=' + value; - store.load(); } } } === modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js' --- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js 2012-11-12 15:53:28 +0000 +++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js 2012-11-13 15:50:05 +0000 @@ -846,7 +846,7 @@ trackMouse: true, cls: 'dv-chart-tips', renderer: function(si, item) { - this.update('' + item.value[1] + ' (' + si.data[DV.conf.finals.data.domain] + ')'); + this.update('' + si.data[DV.conf.finals.data.domain] + '' + '
' + '' + item.value[1] + ''); } }; }, @@ -957,7 +957,7 @@ trackMouse: true, cls: 'dv-chart-tips', renderer: function(si, item) { - this.update('' + item.value[0]); + this.update('' + si.data[DV.conf.finals.data.domain] + '' + '
' + '' + item.value[1] + ''); } }; }, @@ -1076,7 +1076,7 @@ trackMouse: true, cls: 'dv-chart-tips-pie', renderer: function(item) { - this.update(item.data[DV.conf.finals.data.domain] + '
' + item.data[DV.c.series.names[0]] + ''); + this.update('' + item.data[DV.conf.finals.data.domain] + '' + '
' + '' + item.data[DV.c.series.names[0]] + ''); } }; }, @@ -4882,7 +4882,7 @@ }, { xtype: 'panel', - html: 'Direct link: ' + DV.init.contextPath + '/dhis-web-visualizer/app/index.html?id=' + DV.c.currentFavorite.id, + html: 'Link: ' + DV.init.contextPath + '/dhis-web-visualizer/app/index.html?id=' + DV.c.currentFavorite.id, style: 'padding-top: 9px; padding-bottom: 6px', bodyStyle: 'border: 0 none' }