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

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

View File

@@ -175,9 +175,10 @@ class ProjectsController < ApplicationController
@principals_by_role = @project.principals_by_role
@subprojects = @project.children.visible.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
@total_issues_by_tracker = Issue.visible.where(cond).group(:tracker).count