dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 13683
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2014-01-09 18:03:52 +0100
message:
  PT, DV, error handler for 413
modified:
  dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js
  dhis-2/dhis-web/dhis-web-visualizer/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-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js	2014-01-07 16:24:02 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js	2014-01-09 17:03:52 +0000
@@ -2251,7 +2251,7 @@
 					failure: function(r) {
 						web.mask.hide(ns.app.centerRegion);
 
-						if (r.status === 414) {
+						if (r.status === 413 || r.status === 414) {
 							web.analytics.validateUrl(init.contextPath + '/api/analytics.json' + paramString);
 						}
 						else {
@@ -4640,7 +4640,7 @@
 
 		getParamString = function() {
 			var paramString = ns.core.web.analytics.getParamString(ns.core.service.layout.getExtendedLayout(ns.app.layout));
-			
+
 			if (ns.app.layout.showHierarchy) {
 				paramString += '&showHierarchy=true';
 			}

=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js	2014-01-03 18:54:29 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js	2014-01-09 17:03:52 +0000
@@ -1690,7 +1690,7 @@
 					failure: function(r) {
 						web.mask.hide(ns.app.centerRegion);
 
-						if (r.status === 414) {
+						if (r.status === 413 || r.status === 414) {
 							web.analytics.validateUrl(init.contextPath + '/api/analytics.json' + paramString);
 						}
 						else {
@@ -1714,7 +1714,7 @@
 							web.mask.hide(ns.app.centerRegion);
 							return;
 						}
-						
+
 						ns.app.paramString = paramString;
 
 						web.chart.getChart(layout, xLayout, response, isUpdateGui);
@@ -1731,7 +1731,7 @@
 				if (!xLayout) {
 					xLayout = service.layout.getExtendedLayout(layout);
 				}
-				
+
 				// extend response
 				xResponse = service.response.getExtendedResponse(xLayout, response);