dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 8995 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-11-13 13:45:29 +0100
message:
  (GIS) Minor combobox bug fix.
modified:
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/mapfish/widgets/geostat/Thematic1.js
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/mapfish/widgets/geostat/Thematic2.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/mapfish/widgets/geostat/Thematic1.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/mapfish/widgets/geostat/Thematic1.js	2012-11-06 19:47:04 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/mapfish/widgets/geostat/Thematic1.js	2012-11-13 12:44:42 +0000
@@ -386,7 +386,7 @@
                 select: {
                     scope: this,
                     fn: function(cb) {
-                        this.cmp.indicator.clearValue();
+                        this.cmp.dataElement.clearValue();
                         
                         var store = this.cmp.dataElement.store;
                         store.proxy.url = GIS.conf.url.path_api +  'dataElementGroups/' + cb.getValue() + '.json?links=false&paging=false';
@@ -1319,7 +1319,7 @@
 		this.cmp.colorHigh.reset();
 		this.cmp.radiusLow.reset();
 		this.cmp.radiusHigh.reset();
-		this.cmp.level.clearValue();		
+		this.cmp.level.clearValue();
 		this.cmp.parent.reset();
 		
 		// Layer options

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/mapfish/widgets/geostat/Thematic2.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/mapfish/widgets/geostat/Thematic2.js	2012-11-06 19:47:04 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/mapfish/widgets/geostat/Thematic2.js	2012-11-13 12:44:42 +0000
@@ -386,7 +386,7 @@
                 select: {
                     scope: this,
                     fn: function(cb) {
-                        this.cmp.indicator.clearValue();
+                        this.cmp.dataElement.clearValue();
                         
                         var store = this.cmp.dataElement.store;
                         store.proxy.url = GIS.conf.url.path_api +  'dataElementGroups/' + cb.getValue() + '.json?links=false&paging=false';
@@ -1319,7 +1319,7 @@
 		this.cmp.colorHigh.reset();
 		this.cmp.radiusLow.reset();
 		this.cmp.radiusHigh.reset();
-		this.cmp.level.clearValue();		
+		this.cmp.level.clearValue();
 		this.cmp.parent.reset();
 		
 		// Layer options