diff --git a/app/controllers/metric_configurations_controller.rb b/app/controllers/metric_configurations_controller.rb index edf0bfc..6575100 100644 --- a/app/controllers/metric_configurations_controller.rb +++ b/app/controllers/metric_configurations_controller.rb @@ -11,6 +11,7 @@ class MetricConfigurationsController < ApplicationController @mezuro_configuration_id = params[:mezuro_configuration_id].to_i @metric_configuration_id = params[:metric_configuration_id].to_i @base_tools = KalibroGem::Entities::BaseTool.all + @exist_metric = params[:exist_metric] end def new diff --git a/app/views/metric_configurations/choose_metric.html.erb b/app/views/metric_configurations/choose_metric.html.erb index 7f9db98..db5a734 100644 --- a/app/views/metric_configurations/choose_metric.html.erb +++ b/app/views/metric_configurations/choose_metric.html.erb @@ -18,7 +18,9 @@ <% end %>
-<%= link_to 'Compound Metric', new_mezuro_configuration_compound_metric_configuration_path(@mezuro_configuration_id), class: 'btn btn-info' %> +<%= link_to 'Back', mezuro_configuration_path(@mezuro_configuration_id), class: 'btn btn-default' %> +<%= link_to 'Compound Metric', new_mezuro_configuration_compound_metric_configuration_path(@mezuro_configuration_id), class: 'btn btn-info', id: "link_to_compound" %> + diff --git a/app/views/mezuro_configurations/show.html.erb b/app/views/mezuro_configurations/show.html.erb index 5ec96c8..8b059be 100644 --- a/app/views/mezuro_configurations/show.html.erb +++ b/app/views/mezuro_configurations/show.html.erb @@ -10,9 +10,9 @@

Metrics

- <% if mezuro_configuration_owner? @mezuro_configuration.id %> - <%= link_to 'Add Metric', mezuro_configuration_choose_metric_path(@mezuro_configuration.id), class: 'btn btn-info' %> +<% options = @mezuro_configuration_metric_configurations.empty? ? {} : {exist_metric: true}%> + <%= link_to 'Add Metric', mezuro_configuration_choose_metric_path(@mezuro_configuration.id, options), class: 'btn btn-info' %> <% end %> @@ -24,7 +24,7 @@ - <% if @mezuro_configuration_metric_configurations.size == 0 %> + <% if @mezuro_configuration_metric_configurations.empty? %> <%= render partial: 'no_metric_configurations' %> <% else %> <%= render partial: 'metric_configurations', collection: @mezuro_configuration_metric_configurations, as: :metric_configuration %> -- libgit2 0.21.2