Commit ce2b8a0f74d8b1aaf44f879e33802c3113237bfb
1 parent
73a24149
Exists in
colab
and in
4 other branches
Improving the solution #46
Showing
4 changed files
with
9 additions
and
12 deletions
Show diff stats
app/controllers/compound_metric_configurations_controller.rb
| @@ -7,8 +7,7 @@ class CompoundMetricConfigurationsController < BaseMetricConfigurationsControlle | @@ -7,8 +7,7 @@ class CompoundMetricConfigurationsController < BaseMetricConfigurationsControlle | ||
| 7 | respond_to do |format| | 7 | respond_to do |format| |
| 8 | create_and_redir(format) | 8 | create_and_redir(format) |
| 9 | end | 9 | end |
| 10 | - @compound_metric_configuration.configuration_id = params[:mezuro_configuration_id].to_i | ||
| 11 | - Rails.cache.delete("#{@compound_metric_configuration.configuration_id}_metrics") | 10 | + Rails.cache.delete("#{params[:mezuro_configuration_id].to_i}_metric_configurations") |
| 12 | end | 11 | end |
| 13 | 12 | ||
| 14 | def show | 13 | def show |
| @@ -30,7 +29,7 @@ class CompoundMetricConfigurationsController < BaseMetricConfigurationsControlle | @@ -30,7 +29,7 @@ class CompoundMetricConfigurationsController < BaseMetricConfigurationsControlle | ||
| 30 | else | 29 | else |
| 31 | failed_action(format, 'edit') | 30 | failed_action(format, 'edit') |
| 32 | end | 31 | end |
| 33 | - Rails.cache.delete("#{@compound_metric_configuration.configuration_id}_metrics") | 32 | + Rails.cache.delete("#{@compound_metric_configuration.configuration_id}_metric_configurations") |
| 34 | end | 33 | end |
| 35 | end | 34 | end |
| 36 | 35 |
app/controllers/metric_configurations_controller.rb
| @@ -19,8 +19,7 @@ class MetricConfigurationsController < BaseMetricConfigurationsController | @@ -19,8 +19,7 @@ class MetricConfigurationsController < BaseMetricConfigurationsController | ||
| 19 | respond_to do |format| | 19 | respond_to do |format| |
| 20 | create_and_redir(format) | 20 | create_and_redir(format) |
| 21 | end | 21 | end |
| 22 | - @mezuro_configuration_id = params[:mezuro_configuration_id] | ||
| 23 | - Rails.cache.delete("#{@mezuro_configuration_id}_metrics") | 22 | + Rails.cache.delete("#{params[:mezuro_configuration_id]}_metric_configurations") |
| 24 | end | 23 | end |
| 25 | 24 | ||
| 26 | def edit | 25 | def edit |
| @@ -35,7 +34,7 @@ class MetricConfigurationsController < BaseMetricConfigurationsController | @@ -35,7 +34,7 @@ class MetricConfigurationsController < BaseMetricConfigurationsController | ||
| 35 | if @metric_configuration.update(metric_configuration_params) | 34 | if @metric_configuration.update(metric_configuration_params) |
| 36 | format.html { redirect_to(mezuro_configuration_path(@metric_configuration.configuration_id), notice: 'Metric Configuration was successfully updated.') } | 35 | format.html { redirect_to(mezuro_configuration_path(@metric_configuration.configuration_id), notice: 'Metric Configuration was successfully updated.') } |
| 37 | format.json { head :no_content } | 36 | format.json { head :no_content } |
| 38 | - Rails.cache.delete("#{@metric_configuration.configuration_id}_metrics") | 37 | + Rails.cache.delete("#{@metric_configuration.configuration_id}_metric_configurations") |
| 39 | else | 38 | else |
| 40 | failed_action(format, 'edit') | 39 | failed_action(format, 'edit') |
| 41 | end | 40 | end |
| @@ -45,11 +44,10 @@ class MetricConfigurationsController < BaseMetricConfigurationsController | @@ -45,11 +44,10 @@ class MetricConfigurationsController < BaseMetricConfigurationsController | ||
| 45 | def destroy | 44 | def destroy |
| 46 | @metric_configuration.destroy | 45 | @metric_configuration.destroy |
| 47 | respond_to do |format| | 46 | respond_to do |format| |
| 48 | - @metric_configuration.configuration_id = params[:mezuro_configuration_id] | ||
| 49 | - format.html { redirect_to mezuro_configuration_path(@metric_configuration.configuration_id) } | 47 | + format.html { redirect_to mezuro_configuration_path(params[:mezuro_configuration_id]) } |
| 50 | format.json { head :no_content } | 48 | format.json { head :no_content } |
| 51 | end | 49 | end |
| 52 | - Rails.cache.delete("#{@metric_configuration.configuration_id}_metrics") | 50 | + Rails.cache.delete("#{params[:mezuro_configuration_id]}_metric_configurations") |
| 53 | end | 51 | end |
| 54 | 52 | ||
| 55 | protected | 53 | protected |
app/controllers/mezuro_configurations_controller.rb
| @@ -28,7 +28,7 @@ class MezuroConfigurationsController < ApplicationController | @@ -28,7 +28,7 @@ class MezuroConfigurationsController < ApplicationController | ||
| 28 | # GET /mezuro_configurations/1.json | 28 | # GET /mezuro_configurations/1.json |
| 29 | def show | 29 | def show |
| 30 | set_mezuro_configuration | 30 | set_mezuro_configuration |
| 31 | - Rails.cache.fetch("#{@mezuro_configuration.id}_metrics") do | 31 | + Rails.cache.fetch("#{@mezuro_configuration.id}_metric_configurations") do |
| 32 | @mezuro_configuration.metric_configurations | 32 | @mezuro_configuration.metric_configurations |
| 33 | end | 33 | end |
| 34 | end | 34 | end |
app/views/mezuro_configurations/show.html.erb
| @@ -24,10 +24,10 @@ | @@ -24,10 +24,10 @@ | ||
| 24 | </tr> | 24 | </tr> |
| 25 | </thead> | 25 | </thead> |
| 26 | <tbody> | 26 | <tbody> |
| 27 | - <% if Rails.cache.read("#{@mezuro_configuration.id}_metrics").empty? %> | 27 | + <% if Rails.cache.read("#{@mezuro_configuration.id}_metric_configurations").empty? %> |
| 28 | <%= render partial: 'no_metric_configurations' %> | 28 | <%= render partial: 'no_metric_configurations' %> |
| 29 | <% else %> | 29 | <% else %> |
| 30 | - <%= render partial: 'metric_configurations', collection: Rails.cache.read("#{@mezuro_configuration.id}_metrics"), as: :metric_configuration %> | 30 | + <%= render partial: 'metric_configurations', collection: Rails.cache.read("#{@mezuro_configuration.id}_metric_configurations"), as: :metric_configuration %> |
| 31 | <% end %> | 31 | <% end %> |
| 32 | </tbody> | 32 | </tbody> |
| 33 | </table> | 33 | </table> |