X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a16b45eb6a26ad7738e5d919faaf515708507cbf..7377cb63939f8743ca31e67ea3965c2b15d20057:/app/models/acl.rb

diff --git a/app/models/acl.rb b/app/models/acl.rb
index 9938984aa..095bad89b 100644
--- a/app/models/acl.rb
+++ b/app/models/acl.rb
@@ -1,17 +1,38 @@
+# == Schema Information
+#
+# Table name: acls
+#
+#  id      :integer          not null, primary key
+#  address :inet
+#  k       :string           not null
+#  v       :string
+#  domain  :string
+#
+# Indexes
+#
+#  acls_k_idx  (k)
+#
+
 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)
+    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