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 a0e492e8c1f98a6848efc5215db07de5b62f4c7a..6a7dc6c6617b1068c535a2c122b72db4432a8338 100644 (file)
--- a/app/models/candidate.rb
+++ b/app/models/candidate.rb
@@ -1,8 +1,35 @@
+# 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
+
+  # validate uniqueness of a name *within a given election*

 
   def <=>(other)
 
   def <=>(other)

-   self.name <=> other.name 
+    self.name <=> other.name 
+  end
+  
+  def to_s
+    name

   end
 
 end
   end
 
 end

+