diff --git a/app/views/projects/destroy.html.erb b/app/views/projects/destroy.html.erb index d4348b040..6bed5212a 100644 --- a/app/views/projects/destroy.html.erb +++ b/app/views/projects/destroy.html.erb @@ -4,7 +4,8 @@ <%=l(:text_project_destroy_confirmation)%> <% if @project_to_destroy.descendants.any? %> -
<%= l(:text_subprojects_destroy_warning, content_tag('strong', h(@project_to_destroy.descendants.collect{|p| p.to_s}.join(', ')))) %> +
<%= l(:text_subprojects_destroy_warning, + content_tag('strong', h(@project_to_destroy.descendants.collect{|p| p.to_s}.join(', ')))).html_safe %> <% end %>

diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb index 5fbb7e20e..a73bd079a 100644 --- a/test/functional/projects_controller_test.rb +++ b/test/functional/projects_controller_test.rb @@ -444,6 +444,10 @@ class ProjectsControllerTest < ActionController::TestCase assert_response :success assert_template 'destroy' assert_not_nil Project.find_by_id(1) + assert_tag :tag => 'strong', + :content => ['Private child of eCookbook', + 'Child of private child, eCookbook Subproject 1', + 'eCookbook Subproject 2'].join(', ') end def test_destroy