Namespacing: fixing the AR rebservers

fatfreecrm · Apr 10, 2013 · 34d3176 · 34d3176
1 parent 8b74d6d
commit 34d3176
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 10 deletions.
diff --git a/app/models/observers/fat_free_crm/entity_observer.rb b/app/models/observers/fat_free_crm/entity_observer.rb
@@ -1,5 +1,5 @@
 class FatFreeCrm::EntityObserver < ActiveRecord::Observer
-  observe :account, :contact, :lead, :opportunity
+  observe FatFreeCrm::Account, FatFreeCrm::Contact, FatFreeCrm::Lead, FatFreeCrm::Opportunity
 
   def after_create(item)
     send_notification_to_assignee(item) if current_user != item.assignee

diff --git a/app/models/observers/fat_free_crm/lead_observer.rb b/app/models/observers/fat_free_crm/lead_observer.rb
@@ -16,7 +16,7 @@
 #------------------------------------------------------------------------------
 
 class FatFreeCrm::LeadObserver < ActiveRecord::Observer
-  observe :lead
+  observe FatFreeCrm::Lead
 
   @@leads = {}
 

diff --git a/app/models/observers/fat_free_crm/opportunity_observer.rb b/app/models/observers/fat_free_crm/opportunity_observer.rb
@@ -16,7 +16,7 @@
 #------------------------------------------------------------------------------
 
 class FatFreeCrm::OpportunityObserver < ActiveRecord::Observer
-  observe :opportunity
+  observe FatFreeCrm::Opportunity
 
   @@opportunities = {}
 

diff --git a/app/models/observers/fat_free_crm/task_observer.rb b/app/models/observers/fat_free_crm/task_observer.rb
@@ -16,7 +16,7 @@
 #------------------------------------------------------------------------------
 
 class FatFreeCrm::TaskObserver < ActiveRecord::Observer
-  observe :task
+  observe FatFreeCrm::Task
 
   @@tasks = {}
 

diff --git a/lib/fat_free_crm/engine.rb b/lib/fat_free_crm/engine.rb
@@ -21,8 +21,8 @@ class Engine < ::Rails::Engine
     config.autoload_paths += Dir[root.join("app/models/**")] +
                              Dir[root.join("app/controllers/entities")]
 
-    #config.to_prepare do
-    #  ActiveRecord::Base.observers = :lead_observer#, :opportunity_observer, :task_observer
-    #end
+    config.to_prepare do
+      ActiveRecord::Base.observers = FatFreeCrm::LeadObserver, FatFreeCrm::OpportunityObserver, FatFreeCrm::TaskObserver
+    end
   end
 end
diff --git a/lib/fat_free_crm/fields.rb b/lib/fat_free_crm/fields.rb
@@ -35,10 +35,8 @@ def has_fields
 
     module SingletonMethods
       def field_groups
-        raise FatFreeCrm::FieldGroup.inspect
-
         if ActiveRecord::Base.connection.table_exists? 'field_groups'
-          FieldGroup.where(:klass_name => self.name).order(:position)
+          FatFreeCrm::FieldGroup.where(:klass_name => self.name).order(:position)
         else
           []
         end