From a17062a68647bf42de6c3a3ada0bbcde216bf1f5 Mon Sep 17 00:00:00 2001 From: Joseph Magen Date: Sun, 23 Feb 2014 18:04:15 +0200 Subject: [PATCH] fixes bookmark error --- app/views/bookmarks/index.html.erb | 10 +++++----- app/views/common/500.html.erb | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/views/bookmarks/index.html.erb b/app/views/bookmarks/index.html.erb index 756a2b0..bb31bc6 100644 --- a/app/views/bookmarks/index.html.erb +++ b/app/views/bookmarks/index.html.erb @@ -11,12 +11,12 @@ <% for bookmark in @bookmarks %> - <%= link_to_if_authorized(h(bookmark.name), hash_for_edit_bookmark_path(:id => bookmark)) %> - <%=h bookmark.query %> - <%=h bookmark.controller %> - <%=h bookmark.public %> + <%= link_to_if_authorized(h(bookmark.name), hash_for_edit_bookmark_path(bookmark)) %> + <%= bookmark.query %> + <%= bookmark.controller %> + <%= bookmark.public %> - <%= display_delete_if_authorized hash_for_bookmark_path(:id => bookmark.name), :confirm => _("Delete %s?") % bookmark.name %> + <%= display_delete_if_authorized hash_for_bookmark_path(bookmark), :confirm => _("Delete %s?") % bookmark.name %> <% end %> diff --git a/app/views/common/500.html.erb b/app/views/common/500.html.erb index 7078778..0d105a3 100644 --- a/app/views/common/500.html.erb +++ b/app/views/common/500.html.erb @@ -1,7 +1,7 @@ <% title _("Oops, we're sorry but something went wrong") %> -<%= alert :class => 'alert-block alert-danger base in fade', :text => exception.message %> +<%= alert :class => 'alert-block alert-danger base in fade', :text => h(exception.message) %>

<%= _("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" %>, -- 1.7.1