Business intelligence made simple
Use params option for variable params
Andrew Kanee20e0dd7e64a
diff --git a/app/controllers/blazer/dashboards_controller.rb b/app/controllers/blazer/dashboards_controller.rbindex 78bf6b48..c752a8cc 100644--- a/app/controllers/blazer/dashboards_controller.rb+++ b/app/controllers/blazer/dashboards_controller.rb@@ -48,7 +48,7 @@ module Blazerdef updateif update_dashboard(@dashboard)- redirect_to dashboard_path(@dashboard, variable_params(@dashboard))+ redirect_to dashboard_path(@dashboard, params: variable_params(@dashboard))elserender_errors @dashboardend@@ -67,7 +67,7 @@ module BlazerBlazer.transform_statement.call(data_source, statement) if Blazer.transform_statementdata_source.clear_cache(statement)end- redirect_to dashboard_path(@dashboard, variable_params(@dashboard))+ redirect_to dashboard_path(@dashboard, params: variable_params(@dashboard))endprivatediff --git a/app/controllers/blazer/queries_controller.rb b/app/controllers/blazer/queries_controller.rbindex 5f2eb9c2..12438695 100644--- a/app/controllers/blazer/queries_controller.rb+++ b/app/controllers/blazer/queries_controller.rb@@ -52,7 +52,7 @@ module Blazer@query.status = "active" if @query.respond_to?(:status)if @query.save- redirect_to query_path(@query, variable_params(@query))+ redirect_to query_path(@query, params: variable_params(@query))elserender_errors @queryend@@ -172,7 +172,7 @@ module BlazerBlazer.transform_statement.call(data_source, @statement) if Blazer.transform_statement@statement = cohort_analysis_statement(data_source, @statement) if @query.cohort_analysis?data_source.clear_cache(@statement)- redirect_to query_path(@query, variable_params(@query))+ redirect_to query_path(@query, params: variable_params(@query))enddef update@@ -185,7 +185,7 @@ module Blazer@query.errors.add(:base, "Sorry, permission denied")endif @query.errors.empty? && @query.update(query_params)- redirect_to query_path(@query, variable_params(@query))+ redirect_to query_path(@query, params: variable_params(@query))elserender_errors @queryenddiff --git a/app/views/blazer/dashboards/_form.html.erb b/app/views/blazer/dashboards/_form.html.erbindex a57d3031..aa7b5367 100644--- a/app/views/blazer/dashboards/_form.html.erb+++ b/app/views/blazer/dashboards/_form.html.erb@@ -1,4 +1,4 @@-<%= form_for @dashboard, url: (@dashboard.persisted? ? dashboard_path(@dashboard, variable_params(@dashboard)) : dashboards_path(variable_params(@dashboard))), html: {id: "app", class: "small-form"} do |f| %>+<%= form_for @dashboard, url: (@dashboard.persisted? ? dashboard_path(@dashboard, variable_params(@dashboard)) : dashboards_path(params: variable_params(@dashboard))), html: {id: "app", class: "small-form"} do |f| %><% if @dashboard.errors.any? %><div class="alert alert-danger"><%= @dashboard.errors.full_messages.first %></div><% end %>diff --git a/app/views/blazer/dashboards/show.html.erb b/app/views/blazer/dashboards/show.html.erbindex 4878fb0b..d93494ed 100644--- a/app/views/blazer/dashboards/show.html.erb+++ b/app/views/blazer/dashboards/show.html.erb@@ -10,7 +10,7 @@</h3></div><div class="col-sm-3 text-right">- <%= link_to "Edit", edit_dashboard_path(@dashboard, variable_params(@dashboard)), class: "btn btn-info" %>+ <%= link_to "Edit", edit_dashboard_path(@dashboard, params: variable_params(@dashboard)), class: "btn btn-info" %></div></div></div>@@ -21,7 +21,7 @@<% if @data_sources.any? { |ds| ds.cache_mode != "off" } %><p class="text-muted" style="float: right;">Some queries may be cached- <%= link_to "Refresh", refresh_dashboard_path(@dashboard, variable_params(@dashboard)), method: :post %>+ <%= link_to "Refresh", refresh_dashboard_path(@dashboard, params: variable_params(@dashboard)), method: :post %></p><% end %>@@ -33,7 +33,7 @@<% @queries.each_with_index do |query, i| %><div class="chart-container">- <h4><%= link_to query.friendly_name, query_path(query, variable_params(query)), target: "_blank" %></h4>+ <h4><%= link_to query.friendly_name, query_path(query, params: variable_params(query)), target: "_blank" %></h4><div id="chart-<%= i %>" class="chart"><p class="text-muted">Loading...</p></div>diff --git a/app/views/blazer/queries/_caching.html.erb b/app/views/blazer/queries/_caching.html.erbindex 31e820e2..2da0404f 100644--- a/app/views/blazer/queries/_caching.html.erb+++ b/app/views/blazer/queries/_caching.html.erb@@ -10,7 +10,7 @@<% end %><% if @query && params[:query_id] %>- <%= link_to "Refresh", refresh_query_path(@query, variable_params(@query)), method: :post %>+ <%= link_to "Refresh", refresh_query_path(@query, params: variable_params(@query)), method: :post %><% end %></p><% end %>diff --git a/app/views/blazer/queries/_form.html.erb b/app/views/blazer/queries/_form.html.erbindex 7585a1dc..f1d34d0d 100644--- a/app/views/blazer/queries/_form.html.erb+++ b/app/views/blazer/queries/_form.html.erb@@ -3,7 +3,7 @@<% end %><div id="app" v-cloak>- <%= form_for @query, url: (@query.persisted? ? query_path(@query, variable_params(@query)) : queries_path(variable_params(@query))), html: {autocomplete: "off"} do |f| %>+ <%= form_for @query, url: (@query.persisted? ? query_path(@query, params: variable_params(@query)) : queries_path(params: variable_params(@query))), html: {autocomplete: "off"} do |f| %><div class="row"><div id="statement-box" class="col-xs-8"><div class= "form-group">diff --git a/app/views/blazer/queries/run.html.erb b/app/views/blazer/queries/run.html.erbindex 30c66eaf..b067dc72 100644--- a/app/views/blazer/queries/run.html.erb+++ b/app/views/blazer/queries/run.html.erb@@ -31,7 +31,7 @@<% if @query && @result.forecastable? && !params[:forecast] %>·- <%= link_to "Forecast", query_path(@query, {forecast: "t"}.merge(variable_params(@query))) %>+ <%= link_to "Forecast", query_path(@query, params: {forecast: "t"}.merge(variable_params(@query))) %><% end %></p><% end %>diff --git a/app/views/blazer/queries/show.html.erb b/app/views/blazer/queries/show.html.erbindex c04a59bc..d40890ce 100644--- a/app/views/blazer/queries/show.html.erb+++ b/app/views/blazer/queries/show.html.erb@@ -10,8 +10,8 @@</h3></div><div class="col-sm-3 text-right">- <%= link_to "Edit", edit_query_path(@query, variable_params(@query)), class: "btn btn-default", disabled: [email protected]?(blazer_user) %>- <%= link_to "Fork", new_query_path(variable_params(@query).merge(fork_query_id: @query.id, data_source: @query.data_source, name: @query.name)), class: "btn btn-info" %>+ <%= link_to "Edit", edit_query_path(@query, params: variable_params(@query)), class: "btn btn-default", disabled: [email protected]?(blazer_user) %>+ <%= link_to "Fork", new_query_path(params: variable_params(@query).merge(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(query_id: @query.id, format: "csv", forecast: params[:forecast], cohort_period: params[:cohort_period]), params: {statement: @statement}, class: "btn btn-primary" %>diff --git a/test/test_helper.rb b/test/test_helper.rbindex b8d95949..73ab728c 100644--- a/test/test_helper.rb+++ b/test/test_helper.rb@@ -9,6 +9,7 @@ logger = ActiveSupport::Logger.new(ENV["VERBOSE"] ? STDERR : nil)Combustion.path = "test/internal"Combustion.initialize! :active_record, :action_controller, :action_mailer, :sprockets doconfig.action_controller.logger = logger+ config.action_mailer.logger = loggerconfig.active_record.logger = loggerconfig.cache_store = :memory_storeend