diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2012-07-26 23:45:17 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2012-07-26 23:45:17 +0000 |
| commit | 8ed4620bb9e7b30cadea15aa6a4b499a5f165ea1 (patch) | |
| tree | 3e97f1c3bdc24ee34a9587589484f6d3d589e2e5 | |
| parent | 8e1f7607ec6d96fd9314c8b5b0690862065a2f23 (diff) | |
| download | redmine-8ed4620bb9e7b30cadea15aa6a4b499a5f165ea1.tar.gz redmine-8ed4620bb9e7b30cadea15aa6a4b499a5f165ea1.zip | |
fix confirmation page has broken HTML when a project folding sub project is deleted (#11511)
Contributed by Haruka Yoshihara.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10083 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/views/projects/destroy.html.erb | 3 | ||||
| -rw-r--r-- | test/functional/projects_controller_test.rb | 4 |
2 files changed, 6 insertions, 1 deletions
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? %> -<br /><%= l(:text_subprojects_destroy_warning, content_tag('strong', h(@project_to_destroy.descendants.collect{|p| p.to_s}.join(', ')))) %> +<br /><%= l(:text_subprojects_destroy_warning, + content_tag('strong', h(@project_to_destroy.descendants.collect{|p| p.to_s}.join(', ')))).html_safe %> <% end %> </p> <p> 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 |