core/app/models/gaku/address.rb in gaku-0.1.1 vs core/app/models/gaku/address.rb in gaku-0.2.0

@@ -2,28 +2,30 @@
   class Address < ActiveRecord::Base
     belongs_to :country
     belongs_to :state
     belongs_to :addressable, polymorphic: true, counter_cache: true
 
-    scope :deleted,   -> { where(deleted: true) }
     scope :students,  -> { where(addressable_type: 'Gaku::Student') }
     scope :teachers,  -> { where(addressable_type: 'Gaku::Teacher') }
     scope :guardians, -> { where(addressable_type: 'Gaku::Guardian') }
 
-
     validates :address1, :country, :city, presence: true
 
     accepts_nested_attributes_for :country
 
     before_create :ensure_first_primary, on: :create
-    after_save :update_primary_address_field
+    # after_save :update_primary_address_field
     after_destroy :reset_counter_cache
 
+    def to_s
+      "#{city} #{address1}"
+    end
+
     def make_primary
       addresses.where.not(id: id).update_all(primary: false)
       update_attribute(:primary, true)
-      update_primary_address_field
+      # update_primary_address_field
     end
 
     def primary?
       primary
     end
@@ -77,13 +79,12 @@
       if addressable.respond_to?(:addresses)
         self.primary = true if addressable.addresses.blank?
       end
     end
 
-    def update_primary_address_field
-      if addressable && addressable.has_attribute?(:primary_address)
-        addressable.update_attribute(:primary_address, addressable.address_widget)
-      end
-    end
-
+    # def update_primary_address_field
+    #   if addressable && addressable.has_attribute?(:primary_address)
+    #     addressable.update_attribute(:primary_address, addressable.address_widget)
+    #   end
+    # end
   end
 end