Commit 47ad2ee2aaabf5c744835dd9dfaee98cc29efde5
Exists in
colab
and in
2 other branches
Merge pull request #332 from mezuro/hotspot_remove_show_button
Remove Show button for hotspot metric configurations
Showing
2 changed files
with
12 additions
and
10 deletions
Show diff stats
CHANGELOG.rdoc
| @@ -4,6 +4,8 @@ Prezento is the web interface for Mezuro. | @@ -4,6 +4,8 @@ Prezento is the web interface for Mezuro. | ||
| 4 | 4 | ||
| 5 | == Unreleased | 5 | == Unreleased |
| 6 | 6 | ||
| 7 | +* Remove Show button for hotspot metric configurations | ||
| 8 | + | ||
| 7 | == v0.11.3 - 01/04/2016 | 9 | == v0.11.3 - 01/04/2016 |
| 8 | 10 | ||
| 9 | Update KalibroClient error API which now uses Likeno errors | 11 | Update KalibroClient error API which now uses Likeno errors |
app/views/kalibro_configurations/_metric_configurations.html.erb
| 1 | <tr> | 1 | <tr> |
| 2 | <td><%= metric_configuration.metric.name %></td> | 2 | <td><%= metric_configuration.metric.name %></td> |
| 3 | <td><%= metric_configuration.metric.code %></td> | 3 | <td><%= metric_configuration.metric.code %></td> |
| 4 | - <% unless metric_configuration.metric.is_a? KalibroClient::Entities::Miscellaneous::HotspotMetric %> | 4 | + <% unless hotspot_metric_configuration?(metric_configuration) %> |
| 5 | <td><%= metric_configuration.weight %></td> | 5 | <td><%= metric_configuration.weight %></td> |
| 6 | - <% end %> | ||
| 7 | - <td> | ||
| 8 | - <%= link_to_show_page(metric_configuration, @kalibro_configuration.id) %> | ||
| 9 | - </td> | ||
| 10 | - <% if kalibro_configuration_owner? @kalibro_configuration.id %> | ||
| 11 | - <% unless hotspot_metric_configuration?(metric_configuration) %> | 6 | + <td> |
| 7 | + <%= link_to_show_page(metric_configuration, @kalibro_configuration.id) %> | ||
| 8 | + </td> | ||
| 9 | + <% if kalibro_configuration_owner? @kalibro_configuration.id %> | ||
| 12 | <td> | 10 | <td> |
| 13 | <%= link_to_edit_form(metric_configuration, @kalibro_configuration.id) %> | 11 | <%= link_to_edit_form(metric_configuration, @kalibro_configuration.id) %> |
| 14 | </td> | 12 | </td> |
| 15 | <% end %> | 13 | <% end %> |
| 14 | + <% end %> | ||
| 15 | + <% if kalibro_configuration_owner? @kalibro_configuration.id %> | ||
| 16 | <td> | 16 | <td> |
| 17 | - <%= link_to t_action(:destroy, MetricConfiguration), kalibro_configuration_metric_configuration_path(@kalibro_configuration.id, metric_configuration.id), | ||
| 18 | - method: :delete, data: { confirm: t('want_destroy_metric_configuration') }, | ||
| 19 | - class: 'btn btn-danger' %> | 17 | + <%= link_to t_action(:destroy, MetricConfiguration), kalibro_configuration_metric_configuration_path(@kalibro_configuration.id, metric_configuration.id), |
| 18 | + method: :delete, data: {confirm: t('want_destroy_metric_configuration')}, | ||
| 19 | + class: 'btn btn-danger' %> | ||
| 20 | </td> | 20 | </td> |
| 21 | <% end %> | 21 | <% end %> |
| 22 | </tr> | 22 | </tr> |