You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2015/02/25 22:49:59 UTC
[2/4] storm git commit: STORM-687. Storm UI does not display up to
date information despite refreshes in IE.
STORM-687. Storm UI does not display up to date information despite refreshes in IE.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/99aeb80b
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/99aeb80b
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/99aeb80b
Branch: refs/heads/master
Commit: 99aeb80b074f1dc48a396b21ec5ca30a8ed09ddb
Parents: bb05645
Author: Sriharsha Chintalapani <ma...@harsha.io>
Authored: Tue Feb 24 13:35:12 2015 -0800
Committer: Sriharsha Chintalapani <ma...@harsha.io>
Committed: Tue Feb 24 13:35:12 2015 -0800
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/ui/core.clj | 5 +++--
storm-core/src/ui/public/component.html | 1 -
storm-core/src/ui/public/index.html | 1 -
storm-core/src/ui/public/topology.html | 1 -
4 files changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/99aeb80b/storm-core/src/clj/backtype/storm/ui/core.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/ui/core.clj b/storm-core/src/clj/backtype/storm/ui/core.clj
index 6cd821d..09db7e7 100644
--- a/storm-core/src/clj/backtype/storm/ui/core.clj
+++ b/storm-core/src/clj/backtype/storm/ui/core.clj
@@ -867,8 +867,9 @@
(defnk json-response
[data callback :serialize-fn to-json :status 200]
{:status status
- :headers (if (not-nil? callback) {"Content-Type" "application/javascript;charset=utf-8"}
- {"Content-Type" "application/json;charset=utf-8"})
+ :headers (merge {"Cache-Control" "no-cache, no-store"}
+ (if (not-nil? callback) {"Content-Type" "application/javascript;charset=utf-8"}
+ {"Content-Type" "application/json;charset=utf-8"}))
:body (if (not-nil? callback)
(wrap-json-in-callback callback (serialize-fn data))
(serialize-fn data))})
http://git-wip-us.apache.org/repos/asf/storm/blob/99aeb80b/storm-core/src/ui/public/component.html
----------------------------------------------------------------------
diff --git a/storm-core/src/ui/public/component.html b/storm-core/src/ui/public/component.html
index ef57d0c..40350d8 100644
--- a/storm-core/src/ui/public/component.html
+++ b/storm-core/src/ui/public/component.html
@@ -63,7 +63,6 @@ $(document).ready(function() {
if(window) url += "&window="+window;
renderToggleSys($("#toggle-switch"));
$.ajaxSetup({
- "cache": false,
"error":function(jqXHR,textStatus,response) {
var errorJson = jQuery.parseJSON(jqXHR.responseText);
$.get("/templates/json-error-template.html", function(template) {
http://git-wip-us.apache.org/repos/asf/storm/blob/99aeb80b/storm-core/src/ui/public/index.html
----------------------------------------------------------------------
diff --git a/storm-core/src/ui/public/index.html b/storm-core/src/ui/public/index.html
index 50253b0..2dda07a 100644
--- a/storm-core/src/ui/public/index.html
+++ b/storm-core/src/ui/public/index.html
@@ -52,7 +52,6 @@ $(document).ajaxStart(function(){
});
$(document).ready(function() {
$.ajaxSetup({
- "cache": false,
"error":function(jqXHR,textStatus,response) {
var errorJson = jQuery.parseJSON(jqXHR.responseText);
$.get("/templates/json-error-template.html", function(template) {
http://git-wip-us.apache.org/repos/asf/storm/blob/99aeb80b/storm-core/src/ui/public/topology.html
----------------------------------------------------------------------
diff --git a/storm-core/src/ui/public/topology.html b/storm-core/src/ui/public/topology.html
index 9b27fbb..d1b9eaf 100644
--- a/storm-core/src/ui/public/topology.html
+++ b/storm-core/src/ui/public/topology.html
@@ -72,7 +72,6 @@ $(document).ready(function() {
if(window) url += "&window="+window;
renderToggleSys($("#toggle-switch"));
$.ajaxSetup({
- "cache": false,
"error":function(jqXHR,textStatus,response) {
var errorJson = jQuery.parseJSON(jqXHR.responseText);
$.get("/templates/json-error-template.html", function(template) {