merged in from code from the other master

[selectricity] / app / models / candidate.rb

diff --git a/app/models/candidate.rb b/app/models/candidate.rb
index a0e492e8c1f98a6848efc5215db07de5b62f4c7a..6048562988abff1aa552295eb10211389324051c 100644 (file)
--- a/app/models/candidate.rb
+++ b/app/models/candidate.rb
@@ -1,8 +1,24 @@
+# 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. Please see the COPYING file for
+# details.
+
 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)
-   self.name <=> other.name 
+    self.name <=> other.name 
+  end
+  
+  def to_s
+    name
   end
 
 end
+