Project

General

Profile

« Previous | Next » 

Revision d9056afe

Added by Greg Sutcliffe over 10 years ago

Fixes #4014 - Correctly use to_label when showing OSs

View differences:

app/views/architectures/index.html.erb
<% for architecture in @architectures %>
<tr>
<td class='col-md-3'><%= link_to_if_authorized(h(architecture.name), hash_for_edit_architecture_path(:id => architecture)) %></td>
<td><%=h architecture.operatingsystems.to_sentence %></td>
<td><%=h architecture.operatingsystems.map(&:to_label).to_sentence %></td>
<td align="right">
<%= display_delete_if_authorized hash_for_architecture_path(:id => architecture.name), :confirm => "Delete #{architecture.name}?" %>
</td>
app/views/images/index.html.erb
<% @images.each do |image| %>
<tr>
<td><%= image.name %></td>
<td><%= image.operatingsystem %></td>
<td><%= image.operatingsystem.to_label %></td>
<td><%= image.username %></td>
<td><%= image.uuid %></td>
<td><%= image.user_data? ? _("Enabled") : _("Disabled") %></td>
app/views/media/index.html.erb
<td><%= link_to_if_authorized medium, hash_for_edit_medium_path(:id => medium.id) %></td>
<td><%= medium.path %></td>
<td><%= lookup_family(medium.os_family) %></td>
<td><%= medium.operatingsystems.to_sentence %></td>
<td><%= medium.operatingsystems.map(&:to_label).to_sentence %></td>
<td>
<%= display_delete_if_authorized hash_for_medium_path(:id => medium), :confirm => _("Delete %s?") % medium.name %>
</td>
app/views/ptables/index.html.erb
<tr>
<td><%= link_to_if_authorized ptable, hash_for_edit_ptable_path(:id => ptable.id) %></td>
<td><%= lookup_family(ptable.os_family) %></td>
<td><%= ptable.operatingsystems.to_sentence %></td>
<td><%= ptable.operatingsystems.map(&:to_label).to_sentence %></td>
<td>
<%= display_delete_if_authorized hash_for_ptable_path(:id => ptable), :confirm => _("Delete %s?") % ptable.name%>
</td>

Also available in: Unified diff