From fca503df55451e93439237534e64e2b6c3fa8b89 Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Thu, 8 Aug 2013 21:49:46 +0200 Subject: [PATCH] Order in building up the SQL query fixed --- app/controllers/packages_controller.rb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/app/controllers/packages_controller.rb b/app/controllers/packages_controller.rb index 0843515..2305832 100644 --- a/app/controllers/packages_controller.rb +++ b/app/controllers/packages_controller.rb @@ -2,17 +2,19 @@ class PackagesController < ApplicationController def index @packages = Package + if params[:search] + #@packages = @packages.where("packages.name @@ :q or packages.description @@ :q", q: params[:search]) + @packages = @packages.text_search(params[:search]) + end + 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) end - if params[:search] - @packages = @packages.where("packages.name @@ :q or packages.description @@ :q", q: params[:search]) - end - - @packages = @packages.order('name').limit(20) + #@packages = @packages.order('name').limit(20) + @packages = @packages.limit(20) end def with_screenshots