← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1976: (GIS) Fixed bug where predefined legend set combo box is visible when it's supposed to be hidden.

 

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 1976 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: trunk
timestamp: Thu 2010-08-26 16:34:30 +0530
message:
  (GIS) Fixed bug where predefined legend set combo box is visible when it's supposed to be hidden.
modified:
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.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/resources/mapfish/widgets/geostat/Choropleth.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js	2010-08-26 10:20:31 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js	2010-08-26 11:01:44 +0000
@@ -197,6 +197,7 @@
                                     Ext.getCmp('mapview_cb').setValue(MAPVIEW.id);
 									
 									if (MAPVIEW.mapLegendType == map_legend_type_automatic) {
+                                        LEGEND[thematicMap].type = map_legend_type_automatic;
 										Ext.getCmp('maplegendtype_cb').setValue(map_legend_type_automatic);
 										Ext.getCmp('numClasses_cb').setValue(MAPVIEW.classes);
 										Ext.getCmp('colorA_cf').setValue(MAPVIEW.colorLow);
@@ -501,6 +502,7 @@
                                 }                                        
 								
 								if (MAPVIEW.mapLegendType == map_legend_type_automatic) {
+                                    LEGEND[thematicMap].type = map_legend_type_automatic;
 									Ext.getCmp('maplegendtype_cb').setValue(map_legend_type_automatic);
 									Ext.getCmp('numClasses_cb').setValue(MAPVIEW.classes);
 									Ext.getCmp('colorA_cf').setValue(MAPVIEW.colorLow);