X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/cd43529cc8d9b8c020117fd5d690a64f2f0464b9..7a98913d0cf74887180aca3520c628a52b0e7071:/app/models/acl.rb diff --git a/app/models/acl.rb b/app/models/acl.rb index e19c6988b..2db7fb765 100644 --- a/app/models/acl.rb +++ b/app/models/acl.rb @@ -1,9 +1,17 @@ class Acl < ActiveRecord::Base def self.match(address, domain = nil) if domain - condition = Acl.where("address >> ? OR domain = ?", address, domain) + condition = Acl.where("address >>= ? OR domain = ?", address, domain) else - condition = Acl.where("address >> ?", address) + condition = Acl.where("address >>= ?", address) end end + + def self.no_account_creation(address, domain = nil) + self.match(address, domain).where(:k => "no_account_creation").exists? + end + + def self.no_trace_download(address, domain = nil) + self.match(address, domain).where(:k => "no_trace_download").exists? + end end