Move common Spree.user_class role decorations into core

As per BDQ's comment here: spree#1512 (comment)
ceres24 · Jun 20, 2012 · bd52468 · bd52468
1 parent 3fe34d6
commit bd52468
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 17 deletions.
diff --git a/api/app/models/spree/user_decorator.rb b/api/app/models/spree/user_decorator.rb
@@ -1,7 +1,5 @@
 if Spree.user_class
   Spree.user_class.class_eval do
-    has_and_belongs_to_many :roles, :join_table => 'spree_roles_users'
-
     def generate_api_key!
       self.api_key = SecureRandom.hex(24)
       save!
@@ -11,10 +9,5 @@ def clear_api_key!
       self.api_key = nil
       save!
     end
-
-    # has_spree_role? simply needs to return true or false whether a user has a role or not.
-    def has_spree_role?(role_in_question)
-      roles.any? { |role| role.name == role_in_question.to_s }
-    end
   end
 end
diff --git a/core/config/initializers/user_class_extensions.rb b/core/config/initializers/user_class_extensions.rb
@@ -0,0 +1,11 @@
+if Spree.user_class
+  Spree.user_class.class_eval do
+    has_and_belongs_to_many :roles, :join_table => 'spree_roles_users'
+
+    # has_spree_role? simply needs to return true or false whether a user has a role or not.
+    def has_spree_role?(role_in_question)
+      roles.any? { |role| role.name == role_in_question.to_s }
+    end
+  end
+end
+
diff --git a/dash/app/models/spree/user_decorator.rb b/dash/app/models/spree/user_decorator.rb
diff --git a/promo/app/models/spree/user_decorator.rb b/promo/app/models/spree/user_decorator.rb