dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 17001 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2014-10-08 12:10:39 +0200
message:
  GIS legend store synched with api.
modified:
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/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-mapping/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js	2014-10-07 10:55:39 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js	2014-10-08 10:09:37 +0000
@@ -3594,7 +3594,7 @@
                         xtype: 'container',
 						html: GIS.i18n.add_legend,
 						cls: 'gis-panel-html-title',
-                        style: 'padding-left: 2px; margin-bottom: 3px'
+                        style: 'padding-left: 3px; margin-bottom: 3px'
                     },
 					{
 						bodyStyle: 'background-color:#f1f1f1; border:1px solid #ccc; border-radius:1px; padding:' + legendBodyPadding + 'px',
@@ -3639,7 +3639,7 @@
                         xtype: 'container',
 						html: GIS.i18n.current_legends,
 						cls: 'gis-panel-html-title',
-                        style: 'padding-left: 2px; margin-bottom: 3px'
+                        style: 'padding-left: 3px; margin-bottom: 3px'
                     },
                     {
                         xtype: 'container',
@@ -3651,7 +3651,7 @@
 			});
 
 			if (id) {
-				legendStore.proxy.url = gis.init.contextPath + '/api/mapLegendSets/' + id + '.json?links=false&paging=false';                
+				legendStore.proxy.url = gis.init.contextPath + '/api/mapLegendSets/' + id + '.json?fields=mapLegends[id,name,startValue,endValue,color]';                
 				legendStore.load();
 
 				legendSetName.setValue(legendSetStore.getById(id).data.name);