DRY catalog helpers

projectblacklight · Jan 14, 2014 · 08fe600 · 08fe600
1 parent fdf151f
commit 08fe600
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/app/helpers/blacklight/catalog_helper_behavior.rb b/app/helpers/blacklight/catalog_helper_behavior.rb
@@ -97,14 +97,13 @@ def has_search_parameters?
 
   def show_sort_and_per_page? response = nil
     response ||= @response
-    response.total > 1
+    !response.empty?
   end
 
   def should_autofocus_on_search_box?
     controller.is_a? Blacklight::Catalog and
       action_name == "index" and
-      params[:q].to_s.empty? and
-      params[:f].to_s.empty?
+      !has_search_parameters?
   end
 
   def has_thumbnail? document