Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix regression in Rails 4

This commit is contained in:
Sam 2013-11-05 10:32:35 +11:00
parent b11e665ecc
commit 1e21fc8c9a
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/models/screened_ip_address.rb
View File

@ -14,6 +14,15 @@ class ScreenedIpAddress < ActiveRecord::Base
match_for_ip_address(ip_address) || create(opts.slice(:action_type).merge(ip_address: ip_address)) match_for_ip_address(ip_address) || create(opts.slice(:action_type).merge(ip_address: ip_address))
end end
# @Neil please review, in rails 4 when setting an ip address attribute a conversion takes place
# this may explode meaning you will never even reach the validator
# We can work around the issue like so, but I wonder if the spec is valid
def ip_address=(val)
write_attribute(:ip_address, val)
rescue IPAddr::InvalidAddressError
self.errors.add(:ip_address, :invalid)
end
def self.match_for_ip_address(ip_address) def self.match_for_ip_address(ip_address)
# The <<= operator on inet columns means "is contained within or equal to". # The <<= operator on inet columns means "is contained within or equal to".
# #