diff --git a/app/controllers/packages_controller.rb b/app/controllers/packages_controller.rb index 9c65e96..c24c7d0 100644 --- a/app/controllers/packages_controller.rb +++ b/app/controllers/packages_controller.rb @@ -3,16 +3,22 @@ class PackagesController < ApplicationController @packages = Package.includes(:screenshots) if params[:search] - @packages = @packages.text_search(params[:search]) + @packages = @packages.text_search(params[:search][:query]) end - if params[:with_screenshots]=='yes' - # Limit the packages to those that have approved screenshots. - # Also eager-load the screenshots. - @packages = @packages.where("screenshots.approved"=>true) - end + #if params[:with_screenshots]=='yes' + # # Limit the packages to those that have approved screenshots. + # # Also eager-load the screenshots. + # @packages = @packages.where("screenshots.approved"=>true) + #end @packages = @packages.page(params[:page]).per(12) + + if params[:search][:display]=='list' + @view='list' + else + @view='grid' + end end def with_screenshots diff --git a/app/views/packages/_packages_search_results.html.erb b/app/views/packages/_packages_search_results_grid.html.erb similarity index 96% rename from app/views/packages/_packages_search_results.html.erb rename to app/views/packages/_packages_search_results_grid.html.erb index fd4da71..e7b7862 100644 --- a/app/views/packages/_packages_search_results.html.erb +++ b/app/views/packages/_packages_search_results_grid.html.erb @@ -1,4 +1,4 @@ -<% # Show search results %> +<% # Show search results - grid style %> <% if @packages.length>0 %> <% @packages.each do |package| %> diff --git a/app/views/packages/_packages_search_results_list.html.erb b/app/views/packages/_packages_search_results_list.html.erb new file mode 100644 index 0000000..953af11 --- /dev/null +++ b/app/views/packages/_packages_search_results_list.html.erb @@ -0,0 +1,34 @@ +<% # Show search results - list style %> + +<% if @packages.length>0 %> + <% @packages.each do |package| %> +
<%= package.description %>
+ <% end %> +