dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 11139
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-06-05 11:38:42 +0200
message:
  (GIS) Download encoding issue fixed.
modified:
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/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-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	2013-05-30 09:23:07 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js	2013-06-05 09:38:42 +0000
@@ -146,6 +146,7 @@
 			var svgArray = [],
 				svg = '',
 				namespace,
+                title = Ext.htmlEncode(title),
 				titleSVG,
 				legendSVG = '',
 				scalelineSVG,
@@ -185,6 +186,13 @@
 					where,
 					legend;
 
+                // Html encode
+                for (var key in legendConfig) {
+                    if (legendConfig.hasOwnProperty(key)) {
+                        legendConfig[key] = Ext.htmlEncode(legendConfig[key]);
+                    }
+                }
+
 				// SVG
 				svgArray.push(layer.div.innerHTML);
 
@@ -3049,7 +3057,7 @@
 			text: GIS.i18n.download,
 			handler: function() {
 				var type = format.getValue(),
-					title = Ext.htmlEncode(name.getValue()),
+					title = name.getValue(),
 					svg = gis.util.svg.getString(title, gis.util.map.getVisibleVectorLayers()),
 					exportForm = document.getElementById('exportForm');