diff app/controllers/news_controller.rb @ 1517:dffacf8a6908 redmine-2.5

Update to Redmine SVN revision 13367 on 2.5-stable branch
author Chris Cannam
date Tue, 09 Sep 2014 09:29:00 +0100
parents e248c7af89ec
children
line wrap: on
line diff
--- a/app/controllers/news_controller.rb	Tue Sep 09 09:28:31 2014 +0100
+++ b/app/controllers/news_controller.rb	Tue Sep 09 09:29:00 2014 +0100
@@ -42,11 +42,11 @@
     @news_count = scope.count
     @news_pages = Paginator.new @news_count, @limit, params['page']
     @offset ||= @news_pages.offset
-    @newss = scope.all(:include => [:author, :project],
-                                       :order => "#{News.table_name}.created_on DESC",
-                                       :offset => @offset,
-                                       :limit => @limit)
-
+    @newss = scope.includes([:author, :project]).
+                      order("#{News.table_name}.created_on DESC").
+                      limit(@limit).
+                      offset(@offset).
+                      all
     respond_to do |format|
       format.html {
         @news = News.new # for adding news inline