From a5b31a2dcc6108cad650e17d024ff0c7d1e9acea Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Wed, 21 Aug 2013 23:24:07 +0200 Subject: [PATCH] Fixed eager loading of packages/screenshots --- app/controllers/packages_controller.rb | 5 ++--- app/models/screenshot.rb | 1 + app/views/packages/_packages_search_results.html.erb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/packages_controller.rb b/app/controllers/packages_controller.rb index 3c241d6..9c65e96 100644 --- a/app/controllers/packages_controller.rb +++ b/app/controllers/packages_controller.rb @@ -1,6 +1,6 @@ class PackagesController < ApplicationController def index - @packages = Package + @packages = Package.includes(:screenshots) if params[:search] @packages = @packages.text_search(params[:search]) @@ -9,10 +9,9 @@ class PackagesController < ApplicationController if params[:with_screenshots]=='yes' # Limit the packages to those that have approved screenshots. # Also eager-load the screenshots. - @packages = @packages.includes(:screenshots).where("screenshots.approved"=>true) + @packages = @packages.where("screenshots.approved"=>true) end - #@packages = @packages.limit(20) @packages = @packages.page(params[:page]).per(12) end diff --git a/app/models/screenshot.rb b/app/models/screenshot.rb index a0618d3..232135c 100644 --- a/app/models/screenshot.rb +++ b/app/models/screenshot.rb @@ -1,5 +1,6 @@ class Screenshot < ActiveRecord::Base belongs_to :package, :inverse_of=>:screenshots + default_scope { order('uploaddatetime DESC') } diff --git a/app/views/packages/_packages_search_results.html.erb b/app/views/packages/_packages_search_results.html.erb index a41cb9f..d5e15c9 100644 --- a/app/views/packages/_packages_search_results.html.erb +++ b/app/views/packages/_packages_search_results.html.erb @@ -36,4 +36,4 @@ <% end %> - \ No newline at end of file +