From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Fri, 4 May 2012 23:35:29 +0000 (+0000)
Subject: model: convert news finder to Rails3 syntax
X-Git-Tag: 2.0.0~59
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=569e1b37cc0893cd8b1015a6d12212b205f0fbdf;p=redmine.git

model: convert news finder to Rails3 syntax

Contributed by Felix Schäfer.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9624 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/models/news.rb b/app/models/news.rb
index bf1cc4f80..11be6d130 100644
--- a/app/models/news.rb
+++ b/app/models/news.rb
@@ -52,10 +52,9 @@ class News < ActiveRecord::Base
 
   # returns latest news for projects visible by user
   def self.latest(user = User.current, count = 5)
-    find(:all, :limit => count,
-         :conditions => Project.allowed_to_condition(user, :view_news),
-         :include => [ :author, :project ],
-         :order => "#{News.table_name}.created_on DESC")	
+    includes([:author, :project]).where(
+        Project.allowed_to_condition(user, :view_news)
+      ).order("#{News.table_name}.created_on DESC").limit(count).all
   end
 
   private