summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2018-12-21 03:41:15 +0000
committerGo MAEDA <maeda@farend.jp>2018-12-21 03:41:15 +0000
commit93528d124be34f87d7beb29b0a20357fb1d5e7d6 (patch)
treea920865151c4aa8402b3f4119f0dd578fecd11ea /app
parent3816d5a5a90d4cf0e43964daeabef7659cfb31de (diff)
downloadredmine-93528d124be34f87d7beb29b0a20357fb1d5e7d6.tar.gz
redmine-93528d124be34f87d7beb29b0a20357fb1d5e7d6.zip
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
Diffstat (limited to 'app')
-rw-r--r--app/helpers/my_helper.rb4
1 files 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).