Fixes Captcha Settings preferences

2870 · Dec 6, 2011 · bbc7b0b · bbc7b0b
1 parent 89d2eaf
commit bbc7b0b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 17 deletions.
diff --git a/app/models/spree/captcha_configuration.rb b/app/models/spree/captcha_configuration.rb
@@ -1,4 +1,4 @@
-class Spree::CaptchaConfiguration < Spree::Configuration
+class Spree::CaptchaConfiguration < Spree::Preferences::Configuration
   THEMES = ['red', 'white', 'blackglass', 'clean', 'custom']
 
   # this keys works for localhost

diff --git a/lib/spree/captcha/config.rb b/lib/spree/captcha/config.rb
diff --git a/lib/spree_email_to_friend/engine.rb b/lib/spree_email_to_friend/engine.rb
@@ -1,11 +1,18 @@
 require 'recaptcha/rails'
 
+module Spree::Captcha
+end
+
 module SpreeEmailToFriend
   class Engine < Rails::Engine
     engine_name 'spree_email_to_friend'
 
     config.autoload_paths += %W(#{config.root}/lib)
 
+    initializer "spree.email_to_friend.preferences", :after => "spree.environment" do |app|
+      Spree::Captcha::Config = Spree::CaptchaConfiguration.new
+    end
+
     def self.activate
       Dir.glob(File.join(File.dirname(__FILE__), "../../app/**/*_decorator*.rb")) do |c|
         Rails.application.config.cache_classes ? require(c) : load(c)
@@ -14,7 +21,6 @@ def self.activate
       #Dir.glob(File.join(File.dirname(__FILE__), "../../app/overrides/*.rb")) do |c|
       #  Rails.application.config.cache_classes ? require(c) : load(c)
       #end
-      Spree::CaptchaConfiguration.find_or_create_by_name("Default spree_captcha configuration")
     end
 
     config.to_prepare &method(:activate).to_proc