meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-19 15:01:14 +00:00
Code Issues Releases Wiki Activity

Use pluck instead of map in MyHelper (#26711).

Browse Source 
Patch by jwjw yy.


git-svn-id: http://svn.redmine.org/redmine/trunk@17036 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2017-11-26 14:37:31 +00:00
parent 9ae7bc8152
commit 2ecb29bfcb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/my_helper.rb
View File

@ -78,7 +78,7 @@ module MyHelper
def render_calendar_block(block, settings) def render_calendar_block(block, settings)
calendar = Redmine::Helpers::Calendar.new(User.current.today, current_language, :week) calendar = Redmine::Helpers::Calendar.new(User.current.today, current_language, :week)
calendar.events = Issue.visible. calendar.events = Issue.visible.
where(:project_id => User.current.projects.map(&:id)). where(:project_id => User.current.projects.pluck(:id)).
where("(start_date>=? and start_date<=?) or (due_date>=? and due_date<=?)", calendar.startdt, calendar.enddt, calendar.startdt, calendar.enddt). 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). includes(:project, :tracker, :priority, :assigned_to).
references(:project, :tracker, :priority, :assigned_to). references(:project, :tracker, :priority, :assigned_to).
@ -139,7 +139,7 @@ module MyHelper
def render_news_block(block, settings) def render_news_block(block, settings)
news = News.visible. news = News.visible.
where(:project_id => User.current.projects.map(&:id)). where(:project_id => User.current.projects.pluck(:id)).
limit(10). limit(10).
includes(:project, :author). includes(:project, :author).
references(:project, :author). references(:project, :author).