X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a16b45eb6a26ad7738e5d919faaf515708507cbf..6ede8ca04554bc710206206ab45f5135e1cab239:/app/models/acl.rb diff --git a/app/models/acl.rb b/app/models/acl.rb index 9938984aa..8bb4ae4b9 100644 --- a/app/models/acl.rb +++ b/app/models/acl.rb @@ -1,17 +1,21 @@ class Acl < ActiveRecord::Base def self.match(address, domain = nil) if domain - condition = Acl.where("address >> ? OR domain = ?", address, domain) + Acl.where("address >>= ? OR domain = ?", address, domain) else - condition = Acl.where("address >> ?", address) + Acl.where("address >>= ?", address) end end def self.no_account_creation(address, domain = nil) - self.match(address, domain).where(:k => "no_account_creation").exists? + match(address, domain).where(:k => "no_account_creation").exists? + end + + def self.no_note_comment(address, domain = nil) + match(address, domain).where(:k => "no_note_comment").exists? end def self.no_trace_download(address, domain = nil) - self.match(address, domain).where(:k => "no_trace_download").exists? + match(address, domain).where(:k => "no_trace_download").exists? end end