An @edit=true declaration was missing from edit_voters that prevented the voter delet...

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

diff --git a/app/models/candidate.rb b/app/models/candidate.rb
index eeba4d228032499b8d15474123b03e9aa8129208..6a7dc6c6617b1068c535a2c122b72db4432a8338 100644 (file)
--- a/app/models/candidate.rb
+++ b/app/models/candidate.rb
@@ -1,11 +1,26 @@
+# Selectricity: Voting Machinery for the Masses
+# 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/>.
+

 class Candidate < ActiveRecord::Base
   belongs_to :election
 class Candidate < ActiveRecord::Base
   belongs_to :election

+  has_one :picture

   validates_presence_of :name
 
   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)
   # validate uniqueness of a name *within a given election*
 
   def <=>(other)


@@ -16,22 +31,5 @@ class Candidate < ActiveRecord::Base
     name
   end
 
     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
 
 end