diff --git a/app/controllers/compound_metric_configurations_controller.rb b/app/controllers/compound_metric_configurations_controller.rb index b9bd714..7012c94 100644 --- a/app/controllers/compound_metric_configurations_controller.rb +++ b/app/controllers/compound_metric_configurations_controller.rb @@ -7,8 +7,7 @@ class CompoundMetricConfigurationsController < BaseMetricConfigurationsControlle respond_to do |format| create_and_redir(format) end - @compound_metric_configuration.configuration_id = params[:mezuro_configuration_id].to_i - Rails.cache.delete("#{@compound_metric_configuration.configuration_id}_metrics") + Rails.cache.delete("#{params[:mezuro_configuration_id].to_i}_metric_configurations") end def show @@ -30,7 +29,7 @@ class CompoundMetricConfigurationsController < BaseMetricConfigurationsControlle else failed_action(format, 'edit') end - Rails.cache.delete("#{@compound_metric_configuration.configuration_id}_metrics") + Rails.cache.delete("#{@compound_metric_configuration.configuration_id}_metric_configurations") end end diff --git a/app/controllers/metric_configurations_controller.rb b/app/controllers/metric_configurations_controller.rb index 7f557bc..4c43416 100644 --- a/app/controllers/metric_configurations_controller.rb +++ b/app/controllers/metric_configurations_controller.rb @@ -19,8 +19,7 @@ class MetricConfigurationsController < BaseMetricConfigurationsController respond_to do |format| create_and_redir(format) end - @mezuro_configuration_id = params[:mezuro_configuration_id] - Rails.cache.delete("#{@mezuro_configuration_id}_metrics") + Rails.cache.delete("#{params[:mezuro_configuration_id]}_metric_configurations") end def edit @@ -35,7 +34,7 @@ class MetricConfigurationsController < BaseMetricConfigurationsController if @metric_configuration.update(metric_configuration_params) format.html { redirect_to(mezuro_configuration_path(@metric_configuration.configuration_id), notice: 'Metric Configuration was successfully updated.') } format.json { head :no_content } - Rails.cache.delete("#{@metric_configuration.configuration_id}_metrics") + Rails.cache.delete("#{@metric_configuration.configuration_id}_metric_configurations") else failed_action(format, 'edit') end @@ -45,11 +44,10 @@ class MetricConfigurationsController < BaseMetricConfigurationsController def destroy @metric_configuration.destroy respond_to do |format| - @metric_configuration.configuration_id = params[:mezuro_configuration_id] - format.html { redirect_to mezuro_configuration_path(@metric_configuration.configuration_id) } + format.html { redirect_to mezuro_configuration_path(params[:mezuro_configuration_id]) } format.json { head :no_content } end - Rails.cache.delete("#{@metric_configuration.configuration_id}_metrics") + Rails.cache.delete("#{params[:mezuro_configuration_id]}_metric_configurations") end protected diff --git a/app/controllers/mezuro_configurations_controller.rb b/app/controllers/mezuro_configurations_controller.rb index 737f7ee..5f0a827 100644 --- a/app/controllers/mezuro_configurations_controller.rb +++ b/app/controllers/mezuro_configurations_controller.rb @@ -28,7 +28,7 @@ class MezuroConfigurationsController < ApplicationController # GET /mezuro_configurations/1.json def show set_mezuro_configuration - Rails.cache.fetch("#{@mezuro_configuration.id}_metrics") do + Rails.cache.fetch("#{@mezuro_configuration.id}_metric_configurations") do @mezuro_configuration.metric_configurations end end diff --git a/app/views/mezuro_configurations/show.html.erb b/app/views/mezuro_configurations/show.html.erb index 0f0cefb..191aee9 100644 --- a/app/views/mezuro_configurations/show.html.erb +++ b/app/views/mezuro_configurations/show.html.erb @@ -24,10 +24,10 @@ - <% if Rails.cache.read("#{@mezuro_configuration.id}_metrics").empty? %> + <% if Rails.cache.read("#{@mezuro_configuration.id}_metric_configurations").empty? %> <%= render partial: 'no_metric_configurations' %> <% else %> - <%= render partial: 'metric_configurations', collection: Rails.cache.read("#{@mezuro_configuration.id}_metrics"), as: :metric_configuration %> + <%= render partial: 'metric_configurations', collection: Rails.cache.read("#{@mezuro_configuration.id}_metric_configurations"), as: :metric_configuration %> <% end %> -- libgit2 0.21.2