reenable select boxes for filter by facets

app/controllers/search_controller.rb

@@ -4,6 +4,8 @@ class SearchController < ApplicationController
     @originator = params[:originator]
     options = params.slice(:paper_type, :originator)
 
+    @show_filters = true
+
     @response = Paper.search(params[:q], options)
     @papers = @response.page(params[:page]).results
     @paper_type_facets = extract_facets('paper_types')

app/helpers/search_helper.rb

@@ -10,4 +10,17 @@ module SearchHelper
       end
     end
   end
+
+  def filter_select(name, desc, facets, selected)
+    capture do
+      concat(label name, desc)
+      concat(
+        select_tag name,
+          options_from_collection_for_select(facets, :term, :term, selected),
+          include_blank: true,
+          onchange: "this.form.submit();"
+      )
+    end
+  end
+
 end

app/models/paper.rb

@@ -64,8 +64,8 @@ class Paper < ActiveRecord::Base
             # filters
             filter do
               bool do
-                must { term paper_type: options[:paper_type] } if options[:paper_type]
-                must { term originator: options[:originator] } if options[:originator]
+                must { term paper_type: options[:paper_type] } if options[:paper_type].present?
+                must { term originator: options[:originator] } if options[:originator].present?
                 # catchall when no filters set
                 must { match_all } if options.keys.none? {|k| [:paper_type, :originator].include?(k) }
               end

app/views/search/_form.slim

@@ -1,13 +1,10 @@
 = form_tag(search_path, method: :get)
   = text_field_tag(:q, params[:q], placeholder: 'Suche…', autofocus: true)
-  - if false #@show_filters
+  - if @show_filters
     fieldset
       legend Ergebnisse filtern
       .row
         .small-4.columns
-          = label "paper_type", "Typ"
-          = select_tag "paper_type", options_for_select(@paper_types_found, @paper_type), include_blank: true, :onchange => "this.form.submit();"
+          = filter_select("paper_type", "Typ", @paper_type_facets, @paper_type)
         .small-4.columns.end
-          = label "originator", "Einreicher"
-          = select_tag "originator", options_for_select(@originators_found, @originator), include_blank: true, :onchange => "this.form.submit();"
-
+          = filter_select("originator", "Einreicher", @originator_facets, @originator)

app/views/search/index.html.slim

@@ -2,7 +2,7 @@ div
   = render 'search/form'
 
 
-- if params[:q].present?
+- if false # params[:q].present?
   .row
     .small-4.columns
       = facet_list(@paper_type_facets)