From 8e9ff1ef808bb5237f3d651ce01d7a1395fca391 Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Sun, 17 Nov 2013 01:07:27 +0100 Subject: [PATCH] Search query and display selection kept across pages and searches --- app/controllers/packages_controller.rb | 8 +++--- app/views/packages/index.html.erb | 39 +++++++++++++++++--------- config/routes.rb | 16 +++++------ 3 files changed, 38 insertions(+), 25 deletions(-) diff --git a/app/controllers/packages_controller.rb b/app/controllers/packages_controller.rb index de047a4..f43965c 100644 --- a/app/controllers/packages_controller.rb +++ b/app/controllers/packages_controller.rb @@ -6,11 +6,11 @@ class PackagesController < ApplicationController @packages = @packages.text_search(params[:query]) end - #if params[:with_screenshots]=='yes' - # # Limit the packages to those that have approved screenshots. - # # Also eager-load the screenshots. + # Limit the packages to those that have approved screenshots. + # Also eager-load the screenshots. + if params[:show]=='onlywith' @packages = @packages.where("screenshots.approved"=>true) - #end + end @packages = @packages.page(params[:page]).per(12) end diff --git a/app/views/packages/index.html.erb b/app/views/packages/index.html.erb index 35784f6..c030426 100644 --- a/app/views/packages/index.html.erb +++ b/app/views/packages/index.html.erb @@ -3,21 +3,30 @@ Debian Screenshots - <%= form_tag(url_for, method: "get", class: "navbar-form navbar-left form-search", role: "search") do %> + <%= form_tag(url_for, method: 'get', class: 'navbar-form navbar-left form-search', role: 'search') do %>
- <%= search_field_tag('query', nil, placeholder:'Search...', size:30, + <%= search_field_tag('query', params['query'], placeholder:'Search...', size:30, maxlength:200, class:'form-control') %>
+ <%= hidden_field_tag('show', params['show']) %> <% end %> -