add votemail

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

diff --git a/app/models/candidate.rb b/app/models/candidate.rb
index a7d8a50e5e04423292281a636eba59379d1fee92..6048562988abff1aa552295eb10211389324051c 100644 (file)
--- a/app/models/candidate.rb
+++ b/app/models/candidate.rb
@@ -2,28 +2,14 @@
 # Copyright (C) 2007, 2008 Benjamin Mako Hill <mako@atdot.cc>
 # Copyright (C) 2007 Massachusetts Institute of Technology
 #
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public
-# License along with this program.  If not, see
-# <http://www.gnu.org/licenses/>.
+# This program is free software. Please see the COPYING file for
+# details.
 
 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 +20,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