Download as
Browse Code »

Commit ce2b8a0f74d8b1aaf44f879e33802c3113237bfb

Authored by Beatriz Rezener
1 parent 73a24149
Exists in colab and in 4 other branches master, spb-master, spb-stable, stable

Improving the solution #46

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