From 8109be9dc12432fc1c150490d651086814fef061 Mon Sep 17 00:00:00 2001
From: Heitor Reis <marcheing@gmail.com>
Date: Wed, 4 Feb 2015 14:13:13 -0200
Subject: [PATCH] Fixed metric configurations show acceptance tests

---
 app/views/metric_configurations/_ranges.html.erb |  6 +++---
 app/views/metric_configurations/show.html.erb    | 16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/views/metric_configurations/_ranges.html.erb b/app/views/metric_configurations/_ranges.html.erb
index 50857b2..f446512 100644
--- a/app/views/metric_configurations/_ranges.html.erb
+++ b/app/views/metric_configurations/_ranges.html.erb
@@ -8,10 +8,10 @@
   <td><%= kalibro_range.beginning %></td>
   <td><%= kalibro_range.end %></td>
   <td>
-    <% if kalibro_configuration_owner? @metric_configuration.configuration_id %>
+    <% if kalibro_configuration_owner? @metric_configuration.kalibro_configuration_id %>
       <%= link_to 'Edit', edit_kalibro_configuration_metric_configuration_kalibro_range_path(
-                  @metric_configuration.configuration_id, @metric_configuration.id, kalibro_range.id), class: 'btn btn-info' %>
-      <%= link_to 'Destroy', kalibro_configuration_metric_configuration_kalibro_range_path(@metric_configuration.configuration_id,
+                  @metric_configuration.kalibro_configuration_id, @metric_configuration.id, kalibro_range.id), class: 'btn btn-info' %>
+      <%= link_to 'Destroy', kalibro_configuration_metric_configuration_kalibro_range_path(@metric_configuration.kalibro_configuration_id,
       @metric_configuration.id, kalibro_range.id), method: :delete, data: { confirm: 'Are you sure that you want to destroy this Range?' },
       class: 'btn btn-danger' %>
     <% end %>
diff --git a/app/views/metric_configurations/show.html.erb b/app/views/metric_configurations/show.html.erb
index b455c69..a824d77 100644
--- a/app/views/metric_configurations/show.html.erb
+++ b/app/views/metric_configurations/show.html.erb
@@ -4,12 +4,12 @@
 
 <p>
   <strong>Base Tool Name:</strong>
-  <%= @metric_configuration.metric_collector_name %>
+  <%= @metric_configuration.metric.metric_collector_name %>
 </p>
 
 <p>
   <strong>Code:</strong>
-  <%= @metric_configuration.code %>
+  <%= @metric_configuration.metric.code %>
 </p>
 
 <p>
@@ -19,7 +19,7 @@
 
 <p>
   <strong>Language:</strong>
-  <%= @metric_configuration.metric.language %>
+  <%= @metric_configuration.metric.languages %>
 </p>
 
 <p>
@@ -49,8 +49,8 @@
 <hr>
 
 <h2> Ranges </h2>
-<% if kalibro_configuration_owner? @metric_configuration.configuration_id %>
-  <%= link_to 'Add Range', kalibro_configuration_metric_configuration_new_kalibro_range_path(@metric_configuration.configuration_id,
+<% if kalibro_configuration_owner? @metric_configuration.kalibro_configuration_id %>
+  <%= link_to 'Add Range', kalibro_configuration_metric_configuration_new_kalibro_range_path(@metric_configuration.kalibro_configuration_id,
       @metric_configuration.id), class: 'btn btn-info' %>
 <% end %>
 
@@ -72,9 +72,9 @@
 </table>
 
 <p>
- <%= link_to 'Back', kalibro_configuration_path(@metric_configuration.configuration_id), class: 'btn btn-default' %>
-<% if kalibro_configuration_owner? @metric_configuration.configuration_id %>
-      <%= link_to 'Destroy Metric Configuration', kalibro_configuration_metric_configuration_path(@metric_configuration.configuration_id,
+ <%= link_to 'Back', kalibro_configuration_path(@metric_configuration.kalibro_configuration_id), class: 'btn btn-default' %>
+<% if kalibro_configuration_owner? @metric_configuration.kalibro_configuration_id %>
+      <%= link_to 'Destroy Metric Configuration', kalibro_configuration_metric_configuration_path(@metric_configuration.kalibro_configuration_id,
       @metric_configuration.id), method: :delete, data: { confirm: 'Are you sure that you want to destroy this Metric Configuration?' },
       class: 'btn btn-danger' %>
  <% end %>
--
libgit2 0.21.2