Mercurial > hg > soundsoftware-site
changeset 1318:9c2a5a4514a8 redmine-2.2-integration
Merge
| author | luisf <luis.figueira@eecs.qmul.ac.uk> |
|---|---|
| date | Tue, 18 Jun 2013 17:36:47 +0100 |
| parents | 2805873c0147 (current diff) b189ccd72882 (diff) |
| children | 75f258d6f747 |
| files | |
| diffstat | 2 files changed, 13 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- 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 %> + <div class="repository-info"> <% if repository.checkout_description.present? %> <div class="wiki<%= ' bottomline' if protocols.present? %>"><%= textilizable repository.checkout_description %></div> @@ -39,8 +44,3 @@ <% end %> </div> <div style="clear: left"></div> - -<% content_for :header_tags do %> - <%= stylesheet_link_tag 'checkout', :plugin => 'redmine_checkout' %> - <%= javascript_include_tag 'checkout', :plugin => 'redmine_checkout' %> -<% end %>
--- 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