← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 6371: GIS, setting correct http method for ajax requests

 

------------------------------------------------------------
revno: 6371
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2012-03-25 13:59:43 +0200
message:
  GIS, setting correct http method for ajax requests
modified:
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Centroid.js
  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/Point.js
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.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/mapping/javascript/index.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js	2012-03-24 13:34:50 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js	2012-03-25 11:59:43 +0000
@@ -1,5 +1,6 @@
 Ext.onReady( function() {
     Ext.BLANK_IMAGE_URL = '../resources/ext-ux/theme/gray-extend/gray-extend/s.gif';
+    Ext.Ajax.method = 'GET';
 	Ext.layout.FormLayout.prototype.trackLabels = true;
     Ext.QuickTips.init();
 	document.body.oncontextmenu = function(){return false;};
@@ -15,7 +16,6 @@
 	
     Ext.Ajax.request({
         url: G.conf.path_mapping + 'initialize' + G.conf.type,
-        method: 'GET',
         params: {id: G.vars.parameter.id || null},
         success: function(r) {
             var init = Ext.util.JSON.decode(r.responseText);
@@ -1538,7 +1538,6 @@
 	function setHelpText(topic, tab) {
 		Ext.Ajax.request({
 			url: '../../dhis-web-commons-about/getHelpContent.action',
-			method: 'POST',
 			params: {id: topic},
 			success: function(r) {
 				tab.body.update('<div id="help">' + r.responseText + '</div>');
@@ -1724,6 +1723,7 @@
                     
                     Ext.Ajax.request({
                         url: G.conf.path_mapping + 'addOrUpdateMapLayer' + G.conf.type,
+                        method: 'POST',
                         params: params,
                         success: function(r) {
                             Ext.message.msg(true, 'WMS ' + G.i18n.overlay + ' <span class="x-msg-hl">' + bln + '</span> ' + G.i18n.registered);

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Centroid.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Centroid.js	2012-01-20 15:06:41 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Centroid.js	2012-03-25 11:59:43 +0000
@@ -875,7 +875,6 @@
 		var mls = this.cmp.mapLegendSet.getValue();
 		Ext.Ajax.request({
 			url: G.conf.path_mapping + 'getMapLegendsByMapLegendSet' + G.conf.type,
-			method: 'POST',
 			params: {mapLegendSetId: mls},
             scope: this,
 			success: function(r) {
@@ -1066,7 +1065,6 @@
                 
                 Ext.Ajax.request({
                     url: G.conf.path_mapping + dataUrl + G.conf.type,
-                    method: 'POST',
                     params: params,
                     scope: this,
                     success: function(r) {

=== 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	2012-03-23 11:06:09 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js	2012-03-25 11:59:43 +0000
@@ -513,7 +513,6 @@
                         this.updateValues = true;
                         Ext.Ajax.request({
                             url: G.conf.path_mapping + 'getMapLegendSetByIndicator' + G.conf.type,
-                            method: 'POST',
                             params: {indicatorId: cb.getValue()},
                             scope: this,
                             success: function(r) {
@@ -592,7 +591,6 @@
                         this.updateValues = true;
                         Ext.Ajax.request({
                             url: G.conf.path_mapping + 'getMapLegendSetByDataElement' + G.conf.type,
-                            method: 'POST',
                             params: {dataElementId: cb.getValue()},
                             scope: this,
                             success: function(r) {
@@ -1040,7 +1038,6 @@
                     showInfo: function() {                        
                         Ext.Ajax.request({
                             url: G.conf.path_mapping + 'getFacilityInfo' + G.conf.type,
-                            method: 'POST',
                             params: {id: feature.attributes.id},
                             success: function(r) {
                                 var ou = Ext.util.JSON.decode(r.responseText);
@@ -1460,7 +1457,6 @@
 		var mls = this.cmp.mapLegendSet.getValue();
 		Ext.Ajax.request({
 			url: G.conf.path_mapping + 'getMapLegendsByMapLegendSet' + G.conf.type,
-			method: 'POST',
 			params: {mapLegendSetId: mls},
             scope: this,
 			success: function(r) {
@@ -1695,7 +1691,6 @@
                 
                 Ext.Ajax.request({
                     url: G.conf.path_mapping + dataUrl + G.conf.type,
-                    method: 'POST',
                     params: params,
                     scope: this,
                     success: function(r) {

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Point.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Point.js	2012-03-23 11:06:09 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Point.js	2012-03-25 11:59:43 +0000
@@ -513,7 +513,6 @@
                         this.updateValues = true;
                         Ext.Ajax.request({
                             url: G.conf.path_mapping + 'getMapLegendSetByIndicator' + G.conf.type,
-                            method: 'POST',
                             params: {indicatorId: cb.getValue()},
                             scope: this,
                             success: function(r) {
@@ -592,7 +591,6 @@
                         this.updateValues = true;
                         Ext.Ajax.request({
                             url: G.conf.path_mapping + 'getMapLegendSetByDataElement' + G.conf.type,
-                            method: 'POST',
                             params: {dataElementId: cb.getValue()},
                             scope: this,
                             success: function(r) {
@@ -1040,7 +1038,6 @@
                     showInfo: function() {                        
                         Ext.Ajax.request({
                             url: G.conf.path_mapping + 'getFacilityInfo' + G.conf.type,
-                            method: 'POST',
                             params: {id: feature.attributes.id},
                             success: function(r) {
                                 var ou = Ext.util.JSON.decode(r.responseText);
@@ -1460,7 +1457,6 @@
 		var mls = this.cmp.mapLegendSet.getValue();
 		Ext.Ajax.request({
 			url: G.conf.path_mapping + 'getMapLegendsByMapLegendSet' + G.conf.type,
-			method: 'POST',
 			params: {mapLegendSetId: mls},
             scope: this,
 			success: function(r) {
@@ -1695,7 +1691,6 @@
                 
                 Ext.Ajax.request({
                     url: G.conf.path_mapping + dataUrl + G.conf.type,
-                    method: 'POST',
                     params: params,
                     scope: this,
                     success: function(r) {

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js	2012-01-15 13:33:35 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js	2012-03-25 11:59:43 +0000
@@ -528,7 +528,6 @@
                     showInfo: function() {                        
                         Ext.Ajax.request({
                             url: G.conf.path_mapping + 'getFacilityInfo' + G.conf.type,
-                            method: 'POST',
                             params: {id: feature.attributes.id},
                             success: function(r) {
                                 var ou = Ext.util.JSON.decode(r.responseText);