dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #32374
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 16525: PT DV GIS ER EV error handling.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 16525 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-08-26 14:22:47 +0200
message:
PT DV GIS ER EV error handling.
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/app/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/app/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/scripts/core.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/scripts/plugin.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/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-apps/src/main/webapp/dhis-web-event-reports/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/app/scripts/app.js 2014-08-25 13:11:09 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/app/scripts/app.js 2014-08-26 12:20:36 +0000
@@ -2188,7 +2188,8 @@
params: Ext.encode(favorite),
failure: function(r) {
ns.core.web.mask.show();
- alert(r.responseText);
+
+ alert(r.status + '\n' + r.statusText + '\n' + r.responseText);
},
success: function(r) {
var id = r.getAllResponseHeaders().location.split('/').pop();
@@ -2217,7 +2218,8 @@
method: 'GET',
failure: function(r) {
ns.core.web.mask.show();
- alert(r.responseText);
+
+ alert(r.status + '\n' + r.statusText + '\n' + r.responseText);
},
success: function(r) {
eventReport = Ext.decode(r.responseText);
@@ -2230,7 +2232,8 @@
params: Ext.encode(eventReport),
failure: function(r) {
ns.core.web.mask.show();
- alert(r.responseText);
+
+ alert(r.status + '\n' + r.statusText + '\n' + r.responseText);
},
success: function(r) {
if (ns.app.layout && ns.app.layout.id === id) {
@@ -2465,7 +2468,8 @@
method: 'GET',
failure: function(r) {
ns.app.viewport.mask.hide();
- alert(r.responseText);
+
+ alert(r.status + '\n' + r.statusText + '\n' + r.responseText);
},
success: function(r) {
var sharing = Ext.decode(r.responseText),
@@ -6114,7 +6118,8 @@
url: init.contextPath + '/api/eventReports/' + id + '.json?fields=' + conf.url.analysisFields.join(','),
failure: function(r) {
web.mask.hide(ns.app.centerRegion);
- alert(r.responseText);
+
+ alert(r.status + '\n' + r.statusText + '\n' + r.responseText);
},
success: function(r) {
var config = Ext.decode(r.responseText);
@@ -6159,17 +6164,17 @@
// timing
ns.app.dateData = new Date();
-
+
Ext.Ajax.request({
url: ns.core.init.contextPath + paramString,
disableCaching: false,
scope: this,
failure: function(r) {
//ns.app.viewport.setGui(layout, xLayout, isUpdateGui);
-
+
web.mask.hide(ns.app.centerRegion);
- alert(r.responseText);
+ alert(r.status + '\n' + r.statusText + '\n' + r.responseText);
},
success: function(r) {
ns.app.dateCreate = new Date();
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/app/scripts/app.js 2014-08-25 13:11:09 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/app/scripts/app.js 2014-08-26 12:18:42 +0000
@@ -1829,7 +1829,7 @@
params: Ext.encode(favorite),
failure: function(r) {
ns.core.web.mask.show();
- alert(r.responseText);
+ alert(r.status + '\n' + r.statusText + '\n' + r.responseText);
},
success: function(r) {
var id = r.getAllResponseHeaders().location.split('/').pop();
@@ -1860,7 +1860,7 @@
method: 'GET',
failure: function(r) {
ns.core.web.mask.show();
- alert(r.responseText);
+ alert(r.status + '\n' + r.statusText + '\n' + r.responseText);
},
success: function(r) {
eventChart = Ext.decode(r.responseText);
@@ -1873,7 +1873,7 @@
params: Ext.encode(eventChart),
failure: function(r) {
ns.core.web.mask.show();
- alert(r.responseText);
+ alert(r.status + '\n' + r.statusText + '\n' + r.responseText);
},
success: function(r) {
if (ns.app.layout && ns.app.layout.id === id) {
@@ -2108,7 +2108,7 @@
method: 'GET',
failure: function(r) {
ns.app.viewport.mask.hide();
- alert(r.responseText);
+ alert(r.status + '\n' + r.statusText + '\n' + r.responseText);
},
success: function(r) {
var sharing = Ext.decode(r.responseText),
@@ -5763,7 +5763,7 @@
url: init.contextPath + '/api/eventCharts/' + id + '.json?fields=' + conf.url.analysisFields.join(','),
failure: function(r) {
web.mask.hide(ns.app.centerRegion);
- alert(r.responseText);
+ alert(r.status + '\n' + r.statusText + '\n' + r.responseText);
},
success: function(r) {
var layoutConfig = Ext.decode(r.responseText),
@@ -5792,7 +5792,7 @@
web.mask.hide(ns.app.centerRegion);
- alert(r.responseText);
+ alert(r.status + '\n' + r.statusText + '\n' + r.responseText);
},
success: function(r) {
ns.app.dateCreate = new Date();
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/scripts/app.js 2014-08-26 11:58:34 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/scripts/app.js 2014-08-26 12:21:53 +0000
@@ -2903,7 +2903,7 @@
method: 'GET',
failure: function(r) {
gis.olmap.mask.hide();
- alert(r.responseText);
+ alert(r.status + '\n' + r.statusText + '\n' + r.responseText);
},
success: function(r) {
var sharing = Ext.decode(r.responseText),
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/scripts/core.js 2014-08-18 13:45:25 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/scripts/core.js 2014-08-26 12:21:53 +0000
@@ -1160,7 +1160,7 @@
url: gis.init.contextPath + '/api/analytics/events/query/' + view.program.id + '.json' + paramString,
disableCaching: false,
failure: function(r) {
- alert(r.responseText);
+ alert(r.status + '\n' + r.statusText + '\n' + r.responseText);
},
success: function(r) {
success(Ext.decode(r.responseText));
@@ -2119,7 +2119,7 @@
url: gis.init.contextPath + '/api/analytics.json' + paramString,
disableCaching: false,
failure: function(r) {
- alert(r.responseText);
+ alert(r.status + '\n' + r.statusText + '\n' + r.responseText);
},
success: function(r) {
success(Ext.decode(r.responseText));
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/scripts/plugin.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/scripts/plugin.js 2014-08-18 13:24:55 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/scripts/plugin.js 2014-08-26 12:21:53 +0000
@@ -1552,7 +1552,7 @@
url: gis.init.contextPath + '/api/analytics/events/query/' + view.program.id + '.json' + paramString,
disableCaching: false,
failure: function(r) {
- alert(r.responseText);
+ alert(r.status + '\n' + r.statusText + '\n' + r.responseText);
},
success: function(r) {
success(Ext.decode(r.responseText));
@@ -2511,7 +2511,7 @@
url: gis.init.contextPath + '/api/analytics.json' + paramString,
disableCaching: false,
failure: function(r) {
- alert(r.responseText);
+ alert(r.status + '\n' + r.statusText + '\n' + r.responseText);
},
success: function(r) {
success(Ext.decode(r.responseText));
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/scripts/app.js 2014-08-26 09:31:45 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/scripts/app.js 2014-08-26 12:16:56 +0000
@@ -976,7 +976,7 @@
params: Ext.encode(favorite),
failure: function(r) {
ns.core.web.mask.hide(ns.app.centerRegion);
- alert(r.responseText);
+ alert(r.status + '\n' + r.statusText + '\n' + r.responseText);
},
success: function(r) {
var id = r.getAllResponseHeaders().location.split('/').pop();
@@ -1008,7 +1008,7 @@
method: 'GET',
failure: function(r) {
ns.core.web.mask.hide(ns.app.centerRegion);
- alert(r.responseText);
+ alert(r.status + '\n' + r.statusText + '\n' + r.responseText);
},
success: function(r) {
reportTable = Ext.decode(r.responseText);
@@ -1021,7 +1021,7 @@
params: Ext.encode(reportTable),
failure: function(r) {
ns.core.web.mask.hide(ns.app.centerRegion);
- alert(r.responseText);
+ alert(r.status + '\n' + r.statusText + '\n' + r.responseText);
},
success: function(r) {
if (ns.app.layout && ns.app.layout.id && ns.app.layout.id === id) {
@@ -1251,7 +1251,7 @@
method: 'GET',
failure: function(r) {
ns.app.viewport.mask.hide();
- alert(r.responseText);
+ alert(r.status + '\n' + r.statusText + '\n' + r.responseText);
},
success: function(r) {
var sharing = Ext.decode(r.responseText),
@@ -2348,7 +2348,7 @@
url: init.contextPath + '/api/reportTables/' + id + '.json?fields=' + conf.url.analysisFields.join(','),
failure: function(r) {
web.mask.hide(ns.app.centerRegion);
- alert(r.responseText);
+ alert(r.status + '\n' + r.statusText + '\n' + r.responseText);
},
success: function(r) {
var layoutConfig = Ext.decode(r.responseText),
@@ -2395,7 +2395,7 @@
web.analytics.validateUrl(init.contextPath + '/api/analytics.json' + paramString);
}
else {
- alert(r.responseText);
+ alert(r.status + '\n' + r.statusText + '\n' + r.responseText);
}
},
success: function(r) {
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/scripts/app.js 2014-08-26 09:31:45 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/scripts/app.js 2014-08-26 12:17:50 +0000
@@ -1033,7 +1033,7 @@
params: Ext.encode(favorite),
failure: function(r) {
ns.core.web.mask.show();
- alert(r.responseText);
+ alert(r.status + '\n' + r.statusText + '\n' + r.responseText);
},
success: function(r) {
var id = r.getAllResponseHeaders().location.split('/').pop();
@@ -1065,7 +1065,7 @@
method: 'GET',
failure: function(r) {
ns.core.web.mask.show();
- alert(r.responseText);
+ alert(r.status + '\n' + r.statusText + '\n' + r.responseText);
},
success: function(r) {
chart = Ext.decode(r.responseText);
@@ -1078,7 +1078,7 @@
params: Ext.encode(chart),
failure: function(r) {
ns.core.web.mask.show();
- alert(r.responseText);
+ alert(r.status + '\n' + r.statusText + '\n' + r.responseText);
},
success: function(r) {
if (ns.app.layout && ns.app.layout.id && ns.app.layout.id === id) {
@@ -1308,7 +1308,7 @@
method: 'GET',
failure: function(r) {
ns.app.viewport.mask.hide();
- alert(r.responseText);
+ alert(r.status + '\n' + r.statusText + '\n' + r.responseText);
},
success: function(r) {
var sharing = Ext.decode(r.responseText),
@@ -2190,7 +2190,7 @@
url: init.contextPath + '/api/charts/' + id + '.json?fields=' + ns.core.conf.url.analysisFields.join(','),
failure: function(r) {
web.mask.hide(ns.app.centerRegion);
- alert(r.responseText);
+ alert(r.status + '\n' + r.statusText + '\n' + r.responseText);
},
success: function(r) {
var layoutConfig = Ext.decode(r.responseText),
@@ -2231,8 +2231,8 @@
if (r.status === 413 || r.status === 414) {
web.analytics.validateUrl(init.contextPath + '/api/analytics.json' + paramString);
}
- else {
- alert(r.responseText);
+ else {
+ alert(r.status + '\n' + r.statusText + '\n' + r.responseText);
}
},
success: function(r) {
