Merge pull request citrus#18 from ethier/master

meta_search and Ransack - thanks @ethier
sbounmy · Apr 11, 2012 · a8e5229 · a8e5229
2 parents 5c4392d + a949bec
commit a8e5229
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/app/controllers/spree/admin/contents_controller.rb b/app/controllers/spree/admin/contents_controller.rb
@@ -29,10 +29,10 @@ def parent
     end
 
     def collection
-      params[:search] ||= {}
-      params[:search][:meta_sort] ||= "page.asc"
-      @search = parent.contents.metasearch(params[:search])
-      @collection = @search.page(params[:page]).per(Spree::Config[:orders_per_page])
+      params[:q] ||= {}
+      params[:q][:sort] ||= "page.asc"
+      @search = parent.contents.search(params[:q])
+      @collection = @search.result.page(params[:page]).per(Spree::Config[:orders_per_page])
     end
 
 end
diff --git a/app/controllers/spree/admin/pages_controller.rb b/app/controllers/spree/admin/pages_controller.rb
@@ -26,10 +26,10 @@ def find_resource
     end
 
     def collection
-      params[:search] ||= {}
-      params[:search][:meta_sort] ||= "page.asc"
-      @search = Spree::Page.metasearch(params[:search])
-      @collection = @search.page(params[:page]).per(Spree::Config[:orders_per_page])
+      params[:q] ||= {}
+      params[:q][:sort] ||= "page.asc"
+      @search = Spree::Page.search(params[:q])
+      @collection = @search.result.page(params[:page]).per(Spree::Config[:orders_per_page])
     end
 
 end
diff --git a/spree_essential_cms.gemspec b/spree_essential_cms.gemspec
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('spree_essentials', '~> 0.4.0.rc3')
 
   # Development
-  s.add_development_dependency('spree_sample', '~> 1.0.0')
+  s.add_development_dependency('spree_sample', '~> 1.1.0.beta')
 	s.add_development_dependency('dummier',      '~> 0.3.2')
 	s.add_development_dependency('shoulda',      '~> 3.0.0')
 	s.add_development_dependency('factory_girl', '~> 2.6.0')