X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/d207da8dfc3f315f7758d1f5307c700ce4c25156..dcf695c59be7d21509575a4570ba14b619d7723c:/app/models/candidate.rb diff --git a/app/models/candidate.rb b/app/models/candidate.rb index 430b6ab..eeba4d2 100644 --- 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 + # 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) @@ -12,24 +16,21 @@ class Candidate < ActiveRecord::Base 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 - 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? - !self.picture_filename.nil? + !self.picture_obj.nil? end end