Business intelligence made simple
Moved logic to controller [skip ci]
Andrew Kane5ff8bf9ad0e1
diff --git a/app/controllers/blazer/queries_controller.rb b/app/controllers/blazer/queries_controller.rbindex 1c9bfe89..ce0130d7 100644--- a/app/controllers/blazer/queries_controller.rb+++ b/app/controllers/blazer/queries_controller.rb@@ -73,6 +73,12 @@ module Blazer@query.update!(status: "active") if @query.respond_to?(:status) && @query.status.in?(["archived", nil])add_cohort_analysis_vars if @query.cohort_analysis?++ if @success+ @run_data = {statement: @query.statement, query_id: @query.id, data_source: @query.data_source, variables: variable_params(@query)}+ @run_data[:forecast] = "t" if params[:forecast]+ @run_data[:cohort_period] = params[:cohort_period] if params[:cohort_period]+ endenddef editdiff --git a/app/views/blazer/queries/show.html.erb b/app/views/blazer/queries/show.html.erbindex 8828ed00..d3cd8b82 100644--- a/app/views/blazer/queries/show.html.erb+++ b/app/views/blazer/queries/show.html.erb@@ -1,11 +1,5 @@<% blazer_title @query.name %>-<% if @success %>- <% run_data = {statement: @query.statement, query_id: @query.id, data_source: @query.data_source, variables: variable_params(@query)} %>- <% run_data.merge!(forecast: "t") if params[:forecast] %>- <% run_data.merge!(cohort_period: params[:cohort_period]) if params[:cohort_period] %>-<% end %>-<div class="topbar"><div class="container"><div class="row" style="padding-top: 13px;">@@ -20,7 +14,7 @@<%= link_to "Fork", new_query_path(params: {variables: variable_params(@query), fork_query_id: @query.id, data_source: @query.data_source, name: @query.name}), class: "btn btn-info" %><% if !@error && @success %>- <%= button_to "Download", run_queries_path(format: "csv"), params: run_data, class: "btn btn-primary" %>+ <%= button_to "Download", run_queries_path(format: "csv"), params: @run_data, class: "btn btn-primary" %><% end %></div></div>@@ -62,7 +56,7 @@$("#results").addClass("query-error").html(message)}- <%= blazer_js_var "data", run_data %>+ <%= blazer_js_var "data", @run_data %>runQuery(data, showRun, showError)</script>