X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a70b61315c2331c18123a0b36782d6ef6bb3ab3e..2a2a204125383729223083f203a04e9e6eff873d:/app/models/acl.rb?ds=sidebyside diff --git a/app/models/acl.rb b/app/models/acl.rb index e2f163ea5..529ccbe3b 100644 --- a/app/models/acl.rb +++ b/app/models/acl.rb @@ -1,21 +1,23 @@ class Acl < ActiveRecord::Base + validates :k, :presence => true + 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) - self.match(address, domain).where(:k => "no_note_comment").exists? + 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