meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-19 15:01:14 +00:00
Code Issues Releases Wiki Activity

Fix that disabled trackers of subprojects are listed in project overview (#10084).

Browse Source 
Patch by Yuichi HARADA.


git-svn-id: http://svn.redmine.org/redmine/trunk@20635 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2020-12-12 05:40:09 +00:00
parent 5d017f42be
commit 1e906c5ebf
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/projects_controller.rb
View File

@ -175,9 +175,10 @@ class ProjectsController < ApplicationController
@principals_by_role = @project.principals_by_role @principals_by_role = @project.principals_by_role
@subprojects = @project.children.visible.to_a @subprojects = @project.children.visible.to_a
@news = @project.news.limit(5).includes(:author, :project).reorder("#{News.table_name}.created_on DESC").to_a @news = @project.news.limit(5).includes(:author, :project).reorder("#{News.table_name}.created_on DESC").to_a
@trackers = @project.rolled_up_trackers.visible with_subprojects = Setting.display_subprojects_issues?
@trackers = @project.rolled_up_trackers(with_subprojects).visible
cond = @project.project_condition(Setting.display_subprojects_issues?) cond = @project.project_condition(with_subprojects)
@open_issues_by_tracker = Issue.visible.open.where(cond).group(:tracker).count @open_issues_by_tracker = Issue.visible.open.where(cond).group(:tracker).count
@total_issues_by_tracker = Issue.visible.where(cond).group(:tracker).count @total_issues_by_tracker = Issue.visible.where(cond).group(:tracker).count

19
test/functional/projects_controller_test.rb
View File

@ -750,6 +750,25 @@ class ProjectsControllerTest < Redmine::ControllerTest
assert_select 'table.issue-report td.total a', :text => %r{\A[1-9]\d*\z} assert_select 'table.issue-report td.total a', :text => %r{\A[1-9]\d*\z}
end end
def test_show_should_not_display_subprojects_trackers_when_subprojects_issues_is_not_displayed
project = Project.find('ecookbook')
tracker = project.trackers.find_by(name: 'Support request')
project.trackers.delete(tracker)
@request.session[:user_id] = 2
with_settings :display_subprojects_issues => '1' do
get(:show, :params => {:id => 'ecookbook'})
assert_response :success
assert_select 'table.issue-report td.name', :text => 'Support request', :count => 1
end
with_settings :display_subprojects_issues => '0' do
get(:show, :params => {:id => 'ecookbook'})
assert_response :success
assert_select 'table.issue-report td.name', :text => 'Support request', :count => 0
end
end
def test_show_should_spent_and_estimated_time def test_show_should_spent_and_estimated_time
@request.session[:user_id] = 1 @request.session[:user_id] = 1
get(:show, :params => {:id => 'ecookbook'}) get(:show, :params => {:id => 'ecookbook'})