fix issue with db schema content version

[selectricity-live] / app / models / candidate.rb

diff --git a/app/models/candidate.rb b/app/models/candidate.rb
index a7d8a50e5e04423292281a636eba59379d1fee92..6a7dc6c6617b1068c535a2c122b72db4432a8338 100644 (file)
--- a/app/models/candidate.rb
+++ b/app/models/candidate.rb
@@ -18,12 +18,9 @@
 
 class Candidate < ActiveRecord::Base
   belongs_to :election
+  has_one :picture
   validates_presence_of :name
 
-  # i have to call this picture_assoc because picture= does not overload
-  # the normal association method made by has_one
-  has_one :picture_obj, :class_name => "Picture"
-
   # validate uniqueness of a name *within a given election*
 
   def <=>(other)
@@ -34,22 +31,5 @@ class Candidate < ActiveRecord::Base
     name
   end
 
-  def picture
-    picture_obj
-  end
-
-  def picture=(field)
-    if field and field.length > 0
-      self.picture_obj = Picture.new.set_from_field(field)
-      return picture_obj.save
-    else
-      return false
-    end
-  end
-
-  def picture?
-    !self.picture_obj.nil?
-  end
-
 end