# HG changeset patch # User luisf # Date 1371573407 -3600 # Node ID 9c2a5a4514a87d605050f67dbfe3ad95c5770f26 # Parent 2805873c01470e8554d4358ccfec4e1a0778c4fb# Parent b189ccd72882861d65a263169573194213310350 Merge diff -r 2805873c0147 -r 9c2a5a4514a8 plugins/redmine_checkout/app/views/redmine_checkout_hooks/_view_repositories_show_contextual.html.erb --- a/plugins/redmine_checkout/app/views/redmine_checkout_hooks/_view_repositories_show_contextual.html.erb Tue Jun 18 17:34:56 2013 +0100 +++ b/plugins/redmine_checkout/app/views/redmine_checkout_hooks/_view_repositories_show_contextual.html.erb Tue Jun 18 17:36:47 2013 +0100 @@ -1,3 +1,8 @@ + +<% content_for :header_tags do %> + <%= stylesheet_link_tag 'checkout', :plugin => 'redmine_checkout' %> +<% end %> +
<% if repository.checkout_description.present? %>
<%= textilizable repository.checkout_description %>
@@ -39,8 +44,3 @@ <% end %>
- -<% content_for :header_tags do %> - <%= stylesheet_link_tag 'checkout', :plugin => 'redmine_checkout' %> - <%= javascript_include_tag 'checkout', :plugin => 'redmine_checkout' %> -<% end %> diff -r 2805873c0147 -r 9c2a5a4514a8 plugins/redmine_checkout/lib/checkout/repository_hooks.rb --- a/plugins/redmine_checkout/lib/checkout/repository_hooks.rb Tue Jun 18 17:34:56 2013 +0100 +++ b/plugins/redmine_checkout/lib/checkout/repository_hooks.rb Tue Jun 18 17:36:47 2013 +0100 @@ -27,8 +27,14 @@ }) options = {:partial => "redmine_checkout_hooks/view_repositories_show_contextual"} - context[:controller].send(:render_to_string, {:locals => context}.merge(options)) + + # cc: cribbed from + # http://www.redmine.org/projects/redmine/repository/revisions/9785/diff/trunk/lib/redmine/hook.rb + # for http://www.redmine.org/issues/11105 (formerly used + # render_to_string on this controller, wasn't working for + # :header_tags) + context[:hook_caller].send(:render, {:locals => context}.merge(options)) end end end -end \ No newline at end of file +end