Business intelligence made simple
Keep variables after editing dashboard
Andrew Kane4601ac8b1f52
diff --git a/app/controllers/blazer/base_controller.rb b/app/controllers/blazer/base_controller.rbindex a728d340..037e8afc 100644--- a/app/controllers/blazer/base_controller.rb+++ b/app/controllers/blazer/base_controller.rb@@ -42,7 +42,7 @@ module Blazerhelper_method :extract_varsdef variable_params- params.except(:controller, :action, :id, :host, :query, :query_id, :table_names, :authenticity_token, :utf8, :_method, :commit, :statement, :data_source, :name)+ params.except(:controller, :action, :id, :host, :query, :dashboard, :query_id, :query_ids, :table_names, :authenticity_token, :utf8, :_method, :commit, :statement, :data_source, :name)endhelper_method :variable_paramsdiff --git a/app/controllers/blazer/dashboards_controller.rb b/app/controllers/blazer/dashboards_controller.rbindex e95d594c..f48fd7b9 100644--- a/app/controllers/blazer/dashboards_controller.rb+++ b/app/controllers/blazer/dashboards_controller.rb@@ -47,7 +47,7 @@ module Blazerdef updateif update_dashboard(@dashboard)- redirect_to dashboard_path(@dashboard)+ redirect_to dashboard_path(@dashboard, variable_params)elserender :editenddiff --git a/app/views/blazer/dashboards/_form.html.erb b/app/views/blazer/dashboards/_form.html.erbindex baf05def..1cf1f117 100644--- a/app/views/blazer/dashboards/_form.html.erb+++ b/app/views/blazer/dashboards/_form.html.erb@@ -18,7 +18,7 @@ li:hover .glyphicon-remove {}</style>-<%= form_for @dashboard do |f| %>+<%= form_for @dashboard, url: (@dashboard.persisted? ? dashboard_path(@dashboard, variable_params) : dashboards_path(variable_params)) do |f| %><div class="form-group"><%= f.label :name %><%= f.text_field :name, class: "form-control" %>diff --git a/app/views/blazer/dashboards/show.html.erb b/app/views/blazer/dashboards/show.html.erbindex 4febeb4f..4ee96e7e 100644--- a/app/views/blazer/dashboards/show.html.erb+++ b/app/views/blazer/dashboards/show.html.erb@@ -24,7 +24,7 @@</h3></div><div class="col-sm-3 text-right">- <%= link_to "Edit", edit_dashboard_path(@dashboard), class: "btn btn-info" %>+ <%= link_to "Edit", edit_dashboard_path(@dashboard, variable_params), class: "btn btn-info" %></div></div></div>