diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2017-07-08 12:16:36 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2017-07-08 12:16:36 +0000 |
| commit | 3821b34a8b390fc9c689129ce0ef613b00a91940 (patch) | |
| tree | b3436e3670e4f3fbb4df9684b4ccbd187b53d267 /app/controllers/projects_controller.rb | |
| parent | 92ca57e9388d48a3657e866c9cef682ade89beb6 (diff) | |
| download | redmine-3821b34a8b390fc9c689129ce0ef613b00a91940.tar.gz redmine-3821b34a8b390fc9c689129ce0ef613b00a91940.zip | |
Reverts change made to ProjectController in r16766 (#26376).
git-svn-id: http://svn.redmine.org/redmine/trunk@16768 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/projects_controller.rb')
| -rw-r--r-- | app/controllers/projects_controller.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index bded5f251..3e3fc69f3 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -147,6 +147,7 @@ class ProjectsController < ApplicationController end @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.visible @@ -159,8 +160,6 @@ class ProjectsController < ApplicationController @total_hours = TimeEntry.visible.where(cond).sum(:hours).to_f end - @subprojects = @project.children.visible.to_a - @key = User.current.rss_key respond_to do |format| |