Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Re-added some needed .html_safes.

  • Loading branch information...
commit 5d450c427e1fa62bf6caf9ba5018f4a0b4a2738e 1 parent ef27f78
@gunn gunn authored
Showing with 3 additions and 3 deletions.
  1. +3 −3 app/helpers/rails_admin/application_helper.rb
View
6 app/helpers/rails_admin/application_helper.rb
@@ -76,7 +76,7 @@ def navigation nodes_stack, nodes, level=0
link_to node.label_plural, url, :class => "pjax#{level_class}"
end
li + navigation(nodes_stack, nodes_stack.select{ |n| n.parent.to_s == node.abstract_model.model_name}, level+1)
- end.join
+ end.join.html_safe
end
def breadcrumb action = @action, acc = []
@@ -119,13 +119,13 @@ def bulk_menu abstract_model = @abstract_model
actions = actions(:bulkable, abstract_model)
return '' if actions.empty?
content_tag :li, { :class => 'dropdown', :style => 'float:right' } do
- content_tag(:a, { :class => 'dropdown-toggle', :'data-toggle' => "dropdown", :href => '#' }) { t('admin.misc.bulk_menu_title') + '<b class="caret"></b>' } +
+ content_tag(:a, { :class => 'dropdown-toggle', :'data-toggle' => "dropdown", :href => '#' }) { t('admin.misc.bulk_menu_title').html_safe + '<b class="caret"></b>'.html_safe } +
content_tag(:ul, :class => 'dropdown-menu', :style => 'left:auto; right:0;') do
actions.map do |action|
content_tag :li do
link_to wording_for(:bulk_link, action), '#', :onclick => "jQuery('#bulk_action').val('#{action.action_name}'); jQuery('#bulk_form').submit(); return false;"
end
- end.join
+ end.join.html_safe
end
end.html_safe
end
Please sign in to comment.
Something went wrong with that request. Please try again.