From 93528d124be34f87d7beb29b0a20357fb1d5e7d6 Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Fri, 21 Dec 2018 03:41:15 +0000 Subject: [PATCH] Performance improvement when rendering news or calendar block on My page (#30249). Patch by Go MAEDA. git-svn-id: http://svn.redmine.org/redmine/trunk@17771 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/helpers/my_helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/helpers/my_helper.rb b/app/helpers/my_helper.rb index a4b35d890..da42e077d 100644 --- a/app/helpers/my_helper.rb +++ b/app/helpers/my_helper.rb @@ -78,7 +78,7 @@ module MyHelper def render_calendar_block(block, settings) calendar = Redmine::Helpers::Calendar.new(User.current.today, current_language, :week) calendar.events = Issue.visible. - where(:project_id => User.current.projects.pluck(:id)). + where(:project => User.current.projects). where("(start_date>=? and start_date<=?) or (due_date>=? and due_date<=?)", calendar.startdt, calendar.enddt, calendar.startdt, calendar.enddt). includes(:project, :tracker, :priority, :assigned_to). references(:project, :tracker, :priority, :assigned_to). @@ -142,7 +142,7 @@ module MyHelper def render_news_block(block, settings) news = News.visible. - where(:project_id => User.current.projects.pluck(:id)). + where(:project => User.current.projects). limit(10). includes(:project, :author). references(:project, :author).