dice/impress
1
0
Fork 0
forked from OpenNeo/impress
Code Pull requests Activity

better donation feature outfit validation

Browse source 
In particular, outfit_id == 0 would cause outfit_id? to
return false, so it wouldn't run the outfit presence
validation, so /donations/features would try to load
outfit #0 and fail.

Also, flash[:alert] instead of flash[:error] when outfit_id
is bad.
This commit is contained in:
Emi Matchu 2014-09-13 14:16:50 -05:00
parent 485a679f5e
commit 51700a7386
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/donations_controller.rb
View file

@ -28,7 +28,7 @@ class DonationsController < ApplicationController
@features.each(&:save!) @features.each(&:save!)
end end
rescue ActiveRecord::RecordInvalid rescue ActiveRecord::RecordInvalid
flash[:error] = "Couldn't save donation details. Do those outfits exist?" flash[:alert] = "Couldn't save donation details. Do those outfits exist?"
redirect_to @donation redirect_to @donation
else else
flash[:success] = 'Donation details saved! ' + flash[:success] = 'Donation details saved! ' +

6
app/models/donation_feature.rb
View file

@ -2,7 +2,7 @@ class DonationFeature < ActiveRecord::Base
belongs_to :donation belongs_to :donation
belongs_to :outfit belongs_to :outfit
validates :outfit, presence: true, if: :outfit_id? validates :outfit, presence: true, if: :outfit_id_present?
delegate :donor_name, to: :donation delegate :donor_name, to: :donation
@ -13,4 +13,8 @@ class DonationFeature < ActiveRecord::Base
def outfit_url=(outfit_url) def outfit_url=(outfit_url)
self.outfit_id = outfit_url.split('/').last rescue nil self.outfit_id = outfit_url.split('/').last rescue nil
end end
def outfit_id_present?
outfit_id.present?
end
end end