kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Toshi MARUYAMA 2012-07-26 23:45:17 +00:00
parent 8e1f7607ec
commit 8ed4620bb9
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/views/projects/destroy.html.erb
View File

@ -4,7 +4,8 @@
<%=l(:text_project_destroy_confirmation)%> <%=l(:text_project_destroy_confirmation)%>
<% if @project_to_destroy.descendants.any? %> <% 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 %> <% end %>
</p> </p>
<p> <p>

4
test/functional/projects_controller_test.rb
View File

@ -444,6 +444,10 @@ class ProjectsControllerTest < ActionController::TestCase
assert_response :success assert_response :success
assert_template 'destroy' assert_template 'destroy'
assert_not_nil Project.find_by_id(1) 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 end
def test_destroy def test_destroy