Merge head

[selectricity] / app / models / candidate.rb

diff --git a/app/models/candidate.rb b/app/models/candidate.rb
index 430b6ab22762223a728eaf6cc27bb3d51f7b8d2e..eeba4d228032499b8d15474123b03e9aa8129208 100644 (file)
--- a/app/models/candidate.rb
+++ b/app/models/candidate.rb
@@ -2,6 +2,10 @@ class Candidate < ActiveRecord::Base
   belongs_to :election
   validates_presence_of :name
 
   belongs_to :election
   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)


@@ -12,24 +16,21 @@ 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
+  def picture
+    picture_obj

   end
 
   end
 

-  def base_part_of(filename)
-    name = File.basename(filename)
-    name.gsub(/[^\w._-]/, '')
+  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?
   end
 
   def picture?

-    !self.picture_filename.nil?
+    !self.picture_obj.nil?

   end
 
 end
   end
 
 end