Patch by Holger Just (@hjust) and Marius BALTEANU (@marius.balteanu). git-svn-id: https://svn.redmine.org/redmine/trunk@22739 e93f8b46-1217-0410-a6f0-8f06a7374b81pull/149/head
@@ -50,7 +50,7 @@ | |||
</li> | |||
<% end %> | |||
</ul> | |||
<% if @project && @project.descendants.active.any? %> | |||
<% if @project && @project.descendants.visible.any? %> | |||
<%= hidden_field_tag 'with_subprojects', 0, :id => nil %> | |||
<p><label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%></label></p> | |||
<% end %> |
@@ -20,7 +20,7 @@ | |||
<%= check_box_tag "completed", 1, params[:completed] %> <%= l(:label_show_completed_versions) %> | |||
</label> | |||
</li> | |||
<% if @project.descendants.active.any? %> | |||
<% if @project.descendants.visible.any? %> | |||
<li> | |||
<%= hidden_field_tag 'with_subprojects', 0, :id => nil %> | |||
<label> |
@@ -45,6 +45,34 @@ class ActivitiesControllerTest < Redmine::ControllerTest | |||
assert_select 'dl dt.issue-edit a', :text => /(#{IssueStatus.find(2).name})/ | |||
end | |||
def test_index_subproject_checkbox_should_check_descendants_visibility | |||
@request.session[:user_id] = 2 | |||
get( | |||
:index, | |||
:params => { | |||
:id => 5, | |||
} | |||
) | |||
assert_response :success | |||
assert_select '#sidebar input#with_subprojects' | |||
project = Project.find(6) | |||
project.is_public = false | |||
project.save | |||
get( | |||
:index, | |||
:params => { | |||
:id => 5, | |||
} | |||
) | |||
assert_response :success | |||
assert_select '#sidebar input#with_subprojects', :count => 0 | |||
end | |||
def test_project_index_with_invalid_project_id_should_respond_404 | |||
get(:index, :params => {:id => 299}) | |||
assert_response 404 |
@@ -87,6 +87,8 @@ class VersionsControllerTest < Redmine::ControllerTest | |||
assert_select 'h3', :text => Version.find(4).name | |||
# Subproject version | |||
assert_select 'h3', :text => /#{version_name}/ | |||
# Subproject checkbox | |||
assert_select '#sidebar input[id=?][value=?]', "with_subprojects", 1 | |||
end | |||
def test_index_should_prepend_shared_versions | |||
@@ -119,6 +121,20 @@ class VersionsControllerTest < Redmine::ControllerTest | |||
end | |||
end | |||
def test_index_subproject_checkbox_should_check_descendants_visibility | |||
project = Project.find(6) | |||
project.is_public = false | |||
project.save | |||
@request.session[:user_id] = 2 | |||
get :index, :params => {:project_id => 5, :with_subprojects => 1} | |||
assert_response :success | |||
# Subproject checkbox should not be shown | |||
assert_select '#sidebar input[id=?]', "with_subprojects", :count => 0 | |||
end | |||
def test_show | |||
with_settings :gravatar_enabled => '0' do | |||
get :show, :params => {:id => 2} |