Download as
Browse Code »

Commit 8109be9dc12432fc1c150490d651086814fef061

Authored by Heitor
Committed by Rafael Manzo
1 parent 0b494356
Exists in colab and in 4 other branches master, spb-master, spb-stable, stable

Fixed metric configurations show acceptance tests 

Signed off by: Diego Araújo <diegoamc90@gmail.com>
Showing 2 changed files with 11 additions and 11 deletions   Show diff stats
app/views/metric_configurations/_ranges.html.erb
  Diff comments   View file @8109be9
@@ -8,10 +8,10 @@ @@ -8,10 +8,10 @@
8 <td><%= kalibro_range.beginning %></td> 8 <td><%= kalibro_range.beginning %></td>
9 <td><%= kalibro_range.end %></td> 9 <td><%= kalibro_range.end %></td>
10 <td> 10 <td>
11 - <% if kalibro_configuration_owner? @metric_configuration.configuration_id %> 11 + <% if kalibro_configuration_owner? @metric_configuration.kalibro_configuration_id %>
12 <%= link_to 'Edit', edit_kalibro_configuration_metric_configuration_kalibro_range_path( 12 <%= link_to 'Edit', edit_kalibro_configuration_metric_configuration_kalibro_range_path(
13 - @metric_configuration.configuration_id, @metric_configuration.id, kalibro_range.id), class: 'btn btn-info' %>  
14 - <%= link_to 'Destroy', kalibro_configuration_metric_configuration_kalibro_range_path(@metric_configuration.configuration_id, 13 + @metric_configuration.kalibro_configuration_id, @metric_configuration.id, kalibro_range.id), class: 'btn btn-info' %>
  14 + <%= link_to 'Destroy', kalibro_configuration_metric_configuration_kalibro_range_path(@metric_configuration.kalibro_configuration_id,
15 @metric_configuration.id, kalibro_range.id), method: :delete, data: { confirm: 'Are you sure that you want to destroy this Range?' }, 15 @metric_configuration.id, kalibro_range.id), method: :delete, data: { confirm: 'Are you sure that you want to destroy this Range?' },
16 class: 'btn btn-danger' %> 16 class: 'btn btn-danger' %>
17 <% end %> 17 <% end %>
app/views/metric_configurations/show.html.erb
  Diff comments   View file @8109be9
@@ -4,12 +4,12 @@ @@ -4,12 +4,12 @@
4 4
5 <p> 5 <p>
6 <strong>Base Tool Name:</strong> 6 <strong>Base Tool Name:</strong>
7 - <%= @metric_configuration.metric_collector_name %> 7 + <%= @metric_configuration.metric.metric_collector_name %>
8 </p> 8 </p>
9 9
10 <p> 10 <p>
11 <strong>Code:</strong> 11 <strong>Code:</strong>
12 - <%= @metric_configuration.code %> 12 + <%= @metric_configuration.metric.code %>
13 </p> 13 </p>
14 14
15 <p> 15 <p>
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
19 19
20 <p> 20 <p>
21 <strong>Language:</strong> 21 <strong>Language:</strong>
22 - <%= @metric_configuration.metric.language %> 22 + <%= @metric_configuration.metric.languages %>
23 </p> 23 </p>
24 24
25 <p> 25 <p>
@@ -49,8 +49,8 @@ @@ -49,8 +49,8 @@
49 <hr> 49 <hr>
50 50
51 <h2> Ranges </h2> 51 <h2> Ranges </h2>
52 -<% if kalibro_configuration_owner? @metric_configuration.configuration_id %>  
53 - <%= link_to 'Add Range', kalibro_configuration_metric_configuration_new_kalibro_range_path(@metric_configuration.configuration_id, 52 +<% if kalibro_configuration_owner? @metric_configuration.kalibro_configuration_id %>
  53 + <%= link_to 'Add Range', kalibro_configuration_metric_configuration_new_kalibro_range_path(@metric_configuration.kalibro_configuration_id,
54 @metric_configuration.id), class: 'btn btn-info' %> 54 @metric_configuration.id), class: 'btn btn-info' %>
55 <% end %> 55 <% end %>
56 56
@@ -72,9 +72,9 @@ @@ -72,9 +72,9 @@
72 </table> 72 </table>
73 73
74 <p> 74 <p>
75 - <%= link_to 'Back', kalibro_configuration_path(@metric_configuration.configuration_id), class: 'btn btn-default' %>  
76 -<% if kalibro_configuration_owner? @metric_configuration.configuration_id %>  
77 - <%= link_to 'Destroy Metric Configuration', kalibro_configuration_metric_configuration_path(@metric_configuration.configuration_id, 75 + <%= link_to 'Back', kalibro_configuration_path(@metric_configuration.kalibro_configuration_id), class: 'btn btn-default' %>
  76 +<% if kalibro_configuration_owner? @metric_configuration.kalibro_configuration_id %>
  77 + <%= link_to 'Destroy Metric Configuration', kalibro_configuration_metric_configuration_path(@metric_configuration.kalibro_configuration_id,
78 @metric_configuration.id), method: :delete, data: { confirm: 'Are you sure that you want to destroy this Metric Configuration?' }, 78 @metric_configuration.id), method: :delete, data: { confirm: 'Are you sure that you want to destroy this Metric Configuration?' },
79 class: 'btn btn-danger' %> 79 class: 'btn btn-danger' %>
80 <% end %> 80 <% end %>