From 3d8439ac98ef3bc2d3a1ee77e20e854599e36e97 Mon Sep 17 00:00:00 2001 From: John Woodlock Date: Thu, 17 May 2012 17:38:21 +1000 Subject: [PATCH] make sure reports ajax calls dont cache --- .../static/{stretchydata-0.92.js => stretchydata-0.93.js} | 2 ++ .../{stretchyreporting-0.97.js => stretchyreporting-0.98.js} | 4 ++-- .../webapp/WEB-INF/views/common-head-stretchyreporting.jsp | 2 +- .../src/main/webapp/WEB-INF/views/common-head.jsp | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) rename mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/{stretchydata-0.92.js => stretchydata-0.93.js} (99%) rename mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/stretchyreporting/{stretchyreporting-0.97.js => stretchyreporting-0.98.js} (99%) diff --git a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/stretchydata-0.92.js b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/stretchydata-0.93.js similarity index 99% rename from mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/stretchydata-0.92.js rename to mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/stretchydata-0.93.js index 58f98f312..09ee4f1fd 100644 --- a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/stretchydata-0.92.js +++ b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/stretchydata-0.93.js @@ -388,6 +388,7 @@ // crossDomain : true, dataType : 'json', data : form_data, + cache: false, success : function(data, textStatus, jqXHR) { currentEditPopup.dialogDiv.dialog("close"); viewExtraData(currentEditPopup.baseUrl, @@ -455,6 +456,7 @@ cache : false, type : 'GET', contentType : "application/json; charset=utf-8", + cache: false, // dataType : 'jsonp', // crossDomain : true, dataType : 'json', diff --git a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/stretchyreporting/stretchyreporting-0.97.js b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/stretchyreporting/stretchyreporting-0.98.js similarity index 99% rename from mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/stretchyreporting/stretchyreporting-0.97.js rename to mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/stretchyreporting/stretchyreporting-0.98.js index 3ecd465ce..4975815e3 100644 --- a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/stretchyreporting/stretchyreporting-0.97.js +++ b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/stretchyreporting/stretchyreporting-0.98.js @@ -1000,7 +1000,7 @@ alert("needs fixing up, dont rely on data") dataType: 'json', contentType: "application/json; charset=utf-8", crossDomain: false, - cache: true, + cache: false, beforeSend: function( xhr ) { xhr.setRequestHeader("Accept", "application/json"); }, @@ -1052,7 +1052,7 @@ function getReportDataNoAuth(rptName, inParams, successFunction, isParameterType data: inQueryParameters, contentType: "application/json; charset=utf-8", crossDomain: false, - // cache: true, + cache: false, beforeSend: function( xhr ) { xhr.setRequestHeader("Accept", "application/json"); }, diff --git a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/common-head-stretchyreporting.jsp b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/common-head-stretchyreporting.jsp index a8835f39c..1165f77cc 100644 --- a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/common-head-stretchyreporting.jsp +++ b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/common-head-stretchyreporting.jsp @@ -16,6 +16,6 @@ - + diff --git a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/common-head.jsp b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/common-head.jsp index 4b6f022f9..0c6cd059f 100644 --- a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/common-head.jsp +++ b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/common-head.jsp @@ -34,7 +34,7 @@ - +