Commit 60db995f4f5fc01b1e239a283cce71eed4ff8fc9
Exists in
colab
and in
4 other branches
Merge pull request #147 from beatrizrezener/issue45
Refactored disabling new CompoundMetricConfiguration #45
Showing
3 changed files
with
2 additions
and
4 deletions
Show diff stats
app/controllers/metric_configurations_controller.rb
| @@ -3,7 +3,6 @@ class MetricConfigurationsController < BaseMetricConfigurationsController | @@ -3,7 +3,6 @@ class MetricConfigurationsController < BaseMetricConfigurationsController | ||
| 3 | @mezuro_configuration_id = params[:mezuro_configuration_id].to_i | 3 | @mezuro_configuration_id = params[:mezuro_configuration_id].to_i |
| 4 | @metric_configuration_id = params[:metric_configuration_id].to_i | 4 | @metric_configuration_id = params[:metric_configuration_id].to_i |
| 5 | @metric_collectors = KalibroGatekeeperClient::Entities::MetricCollector.all | 5 | @metric_collectors = KalibroGatekeeperClient::Entities::MetricCollector.all |
| 6 | - @exist_metric = params[:exist_metric] | ||
| 7 | end | 6 | end |
| 8 | 7 | ||
| 9 | def new | 8 | def new |
app/views/metric_configurations/choose_metric.html.erb
| @@ -31,7 +31,7 @@ | @@ -31,7 +31,7 @@ | ||
| 31 | }); | 31 | }); |
| 32 | }); | 32 | }); |
| 33 | 33 | ||
| 34 | - <% if @exist_metric.nil? %> | 34 | + <% if MetricConfiguration.metric_configurations_of(@mezuro_configuration_id).blank? %> |
| 35 | $("#link_to_compound").css("display", "none"); | 35 | $("#link_to_compound").css("display", "none"); |
| 36 | <% end %> | 36 | <% end %> |
| 37 | </script> | 37 | </script> |
app/views/mezuro_configurations/show.html.erb
| @@ -11,8 +11,7 @@ | @@ -11,8 +11,7 @@ | ||
| 11 | 11 | ||
| 12 | <h2> Metrics </h2> | 12 | <h2> Metrics </h2> |
| 13 | <% if mezuro_configuration_owner? @mezuro_configuration.id %> | 13 | <% if mezuro_configuration_owner? @mezuro_configuration.id %> |
| 14 | -<% options = @mezuro_configuration_metric_configurations.empty? ? {} : {exist_metric: true}%> | ||
| 15 | - <%= link_to 'Add Metric', mezuro_configuration_choose_metric_path(@mezuro_configuration.id, options), class: 'btn btn-info' %> | 14 | + <%= link_to 'Add Metric', mezuro_configuration_choose_metric_path(@mezuro_configuration.id), class: 'btn btn-info' %> |
| 16 | <% end %> | 15 | <% end %> |
| 17 | 16 | ||
| 18 | <table class="table table-hover"> | 17 | <table class="table table-hover"> |