aboutsummaryrefslogtreecommitdiffstats
path: root/app/models/profile_photo.rb
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2013-02-14 18:56:16 +0000
committerLouise Crow <louise.crow@gmail.com>2013-02-14 19:03:40 +0000
commitbc0cc811e80143d0255d86433a80a823d1141dd0 (patch)
tree0c5005b2b03e540d8ab562da06539414709fbc18 /app/models/profile_photo.rb
parent6fa9c17c7cd5551489a77f6e89543b7886be51d4 (diff)
parent2c5749d4d92e6601856cef6f7e2201d06d885183 (diff)
Merge branch 'release/0.7'0.7.00.7
Diffstat (limited to 'app/models/profile_photo.rb')
-rw-r--r--app/models/profile_photo.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/models/profile_photo.rb b/app/models/profile_photo.rb
index 6e605651d..73d7ca12b 100644
--- a/app/models/profile_photo.rb
+++ b/app/models/profile_photo.rb
@@ -23,6 +23,8 @@ class ProfilePhoto < ActiveRecord::Base
belongs_to :user
+ validate :data_and_draft_checks
+
# deliberately don't strip_attributes, so keeps raw photo properly
attr_accessor :x, :y, :w, :h
@@ -81,7 +83,9 @@ class ProfilePhoto < ActiveRecord::Base
end
end
- def validate
+ private
+
+ def data_and_draft_checks
if self.data.nil?
errors.add(:data, N_("Please choose a file containing your photo."))
return