merged more fixes from devel

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

diff --git a/app/models/candidate.rb b/app/models/candidate.rb
index 430b6ab22762223a728eaf6cc27bb3d51f7b8d2e..6a7dc6c6617b1068c535a2c122b72db4432a8338 100644 (file)
--- a/app/models/candidate.rb
+++ b/app/models/candidate.rb
@@ -1,5 +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: 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*
   validates_presence_of :name
 
   # validate uniqueness of a name *within a given election*


@@ -12,25 +31,5 @@ class Candidate < ActiveRecord::Base
     name
   end
 
     name
   end
 

-  def picture=(picture_field)
-    if picture_field
-      unless picture_field.content_type.match(/^image/)
-        return false
-      end
-      self.picture_filename = base_part_of(picture_field.original_filename)
-      self.picture_type =  picture_field.content_type.chomp
-      self.picture_data = picture_field.read
-    end
-  end
-
-  def base_part_of(filename)
-    name = File.basename(filename)
-    name.gsub(/[^\w._-]/, '')
-  end
-
-  def picture?
-    !self.picture_filename.nil?
-  end
-

 end
 
 end