Business intelligence made simple
Fixed variable params
Andrew Kaneba15dedaeec8
diff --git a/app/controllers/blazer/base_controller.rb b/app/controllers/blazer/base_controller.rbindex d8841f8d..9d7253aa 100644--- a/app/controllers/blazer/base_controller.rb+++ b/app/controllers/blazer/base_controller.rb@@ -112,6 +112,7 @@ module Blazerdef nested_variable_params(resource)variable_params(resource, request.query_parameters["variables"] || {})end+ helper_method :nested_variable_paramsdef blazer_usersend(Blazer.user_method) if Blazer.user_method && respond_to?(Blazer.user_method, true)diff --git a/app/controllers/blazer/queries_controller.rb b/app/controllers/blazer/queries_controller.rbindex b1bd1cb9..ece7f6a3 100644--- a/app/controllers/blazer/queries_controller.rb+++ b/app/controllers/blazer/queries_controller.rb@@ -44,7 +44,6 @@ module Blazer@query.data_source ||= upload_settings["data_source"]@query.statement ||= "SELECT * FROM #{upload.table_name} LIMIT 10"end- @variable_params = nested_variable_params(@query)enddef create@@ -77,7 +76,6 @@ module Blazerenddef edit- @variable_params = variable_params(@query)enddef rundiff --git a/app/views/blazer/queries/_form.html.erb b/app/views/blazer/queries/_form.html.erbindex 2b3572cd..5ad024c2 100644--- a/app/views/blazer/queries/_form.html.erb+++ b/app/views/blazer/queries/_form.html.erb@@ -2,6 +2,8 @@<div class="alert alert-danger"><%= @query.errors.full_messages.first %></div><% end %>+<% @variable_params = @query.persisted? ? variable_params(@query) : nested_variable_params(@query) %>+<div id="app" v-cloak><%= form_for @query, url: (@query.persisted? ? query_path(@query, params: @variable_params) : queries_path(params: @variable_params)), html: {autocomplete: "off"} do |f| %><div class="row">