Project

General

Profile

0001-fixes-bookmark-error.patch

v1 patch - Dominic Cleal, 02/26/2014 04:28 PM

View differences:

app/views/bookmarks/index.html.erb
11 11
  </tr>
12 12
  <% for bookmark in @bookmarks %>
13 13
    <tr>
14
      <td><%= link_to_if_authorized(h(bookmark.name), hash_for_edit_bookmark_path(:id => bookmark)) %></td>
15
      <td><%=h bookmark.query %></td>
16
      <td><%=h bookmark.controller %></td>
17
      <td><%=h bookmark.public %></td>
14
      <td><%= link_to_if_authorized(h(bookmark.name), hash_for_edit_bookmark_path(bookmark)) %></td>
15
      <td><%= bookmark.query %></td>
16
      <td><%= bookmark.controller %></td>
17
      <td><%= bookmark.public %></td>
18 18
      <td align="right">
19
        <%= display_delete_if_authorized hash_for_bookmark_path(:id => bookmark.name), :confirm => _("Delete %s?") % bookmark.name  %>
19
        <%= display_delete_if_authorized hash_for_bookmark_path(bookmark), :confirm => _("Delete %s?") % bookmark.name  %>
20 20
      </td>
21 21
    </tr>
22 22
  <% end %>
app/views/common/500.html.erb
1 1
<% title _("Oops, we're sorry but something went wrong") %>
2 2

  
3 3

  
4
<%= alert :class => 'alert-block alert-danger base in fade', :text => exception.message %>
4
<%= alert :class => 'alert-block alert-danger base in fade', :text => h(exception.message) %>
5 5

  
6 6
<p>
7 7
  <%= _("If you feel this is an error with Foreman itself, please open a new issue with") %> <%= link_to _("Foreman ticketing system"), "http://theforeman.org/projects/foreman/issues", :rel => "external" %>,
8
-