Merge remote-tracking branch 'upstream/pull/2108'

[rails.git] / app / models / acl.rb

diff --git a/app/models/acl.rb b/app/models/acl.rb
index e2f163ea585bf8bd5453208c7da72dc24d360548..095bad89b942d07e62ee74b18e999100905c456b 100644 (file)
--- a/app/models/acl.rb
+++ b/app/models/acl.rb
@@ -1,21 +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
 class Acl < ActiveRecord::Base

+  validates :k, :presence => true
+

   def self.match(address, domain = nil)
     if domain
   def self.match(address, domain = nil)
     if domain

-      condition = Acl.where("address >>= ? OR domain = ?", address, domain)
+      Acl.where("address >>= ? OR domain = ?", address, domain)

     else
     else

-      condition = Acl.where("address >>= ?", address)
+      Acl.where("address >>= ?", address)

     end
   end
 
   def self.no_account_creation(address, domain = nil)
     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)
   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)
   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
   end
 end