Business intelligence made simple
Fixed query cancellation
Andrew Kanee451da2428a5
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 09c2e56c..12bf828f 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -1,6 +1,7 @@## 1.8.1 [unreleased]- Added support for Amazon Athena+- Fixed query cancellation## 1.8.0diff --git a/app/assets/javascripts/blazer/queries.js b/app/assets/javascripts/blazer/queries.jsindex b97f91dd..262b7b6b 100644--- a/app/assets/javascripts/blazer/queries.js+++ b/app/assets/javascripts/blazer/queries.js@@ -95,7 +95,7 @@ function cancelQuery(query) {var path = Routes.cancel_queries_path()var data = {run_id: query.run_id, data_source: query.data_source}if (navigator.sendBeacon) {- navigator.sendBeacon(path, csrfProtect(data))+ navigator.sendBeacon(path + "?" + $.param(csrfProtect(data)))} else {// TODO make sync$.post(path, data)@@ -106,5 +106,5 @@ function csrfProtect(payload) {var param = $("meta[name=csrf-param]").attr("content")var token = $("meta[name=csrf-token]").attr("content")if (param && token) payload[param] = token- return new Blob([JSON.stringify(payload)], {type : "application/json; charset=utf-8"})+ return payload}diff --git a/app/controllers/blazer/queries_controller.rb b/app/controllers/blazer/queries_controller.rbindex d4848751..40d60be0 100644--- a/app/controllers/blazer/queries_controller.rb+++ b/app/controllers/blazer/queries_controller.rb@@ -183,7 +183,7 @@ module Blazerdef cancelBlazer.data_sources[params[:data_source]].cancel(blazer_run_id)- render json: {}+ head :okendprivate