Merged r15540 (#285).

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15542 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2016-06-18 06:46:55 +00:00
parent 89cfe130fc
commit 26ec2cdc07
6 changed files with 58 additions and 15 deletions

View File

@@ -137,7 +137,7 @@ class ProjectsController < ApplicationController
@users_by_role = @project.users_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
@trackers = @project.rolled_up_trackers.visible
cond = @project.project_condition(Setting.display_subprojects_issues?)