From f8df0e729c5c2b6d2579405fa4e689d0cebafebc Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Tue, 7 Jan 2014 14:11:03 +0000 Subject: [PATCH] Rails4: deprecated find_by methods with options at ApplicationHelper git-svn-id: http://svn.redmine.org/redmine/trunk@12491 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/helpers/application_helper.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index bb7208e36..cf7c11740 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -759,7 +759,8 @@ module ApplicationHelper oid = identifier.to_i case prefix when nil - if oid.to_s == identifier && issue = Issue.visible.find_by_id(oid, :include => :status) + if oid.to_s == identifier && + issue = Issue.visible.includes(:status).find_by_id(oid) anchor = comment_id ? "note-#{comment_id}" : nil link = link_to(h("##{oid}#{comment_suffix}"), {:only_path => only_path, :controller => 'issues', :action => 'show', :id => oid, :anchor => anchor}, :class => issue.css_classes, @@ -776,7 +777,7 @@ module ApplicationHelper :class => 'version' end when 'message' - if message = Message.visible.find_by_id(oid, :include => :parent) + if message = Message.visible.includes(:parent).find_by_id(oid) link = link_to_message(message, {:only_path => only_path}, :class => 'message') end when 'forum' -- 2.39.5