fixes #2311
This commit is contained in:
@@ -1,6 +1,14 @@
|
|||||||
class DmailFilter < ActiveRecord::Base
|
class DmailFilter < ActiveRecord::Base
|
||||||
belongs_to :user
|
belongs_to :user
|
||||||
attr_accessible :user_id, :words, :as => [:moderator, :janitor, :contributor, :gold, :member, :anonymous, :default, :builder, :admin]
|
attr_accessible :user_id, :words, :as => [:moderator, :janitor, :contributor, :gold, :member, :anonymous, :default, :builder, :admin]
|
||||||
|
validates_presence_of :user
|
||||||
|
before_validation :initialize_user
|
||||||
|
|
||||||
|
def initialize_user
|
||||||
|
unless user_id
|
||||||
|
self.user_id = CurrentUser.user.user_id
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
def filtered?(dmail)
|
def filtered?(dmail)
|
||||||
dmail.from.level <= User::Levels::MODERATOR && (dmail.body =~ regexp || dmail.subject =~ regexp)
|
dmail.from.level <= User::Levels::MODERATOR && (dmail.body =~ regexp || dmail.subject =~ regexp)
|
||||||
|
|||||||
Reference in New Issue
Block a user