diff options
| author | Gareth Rees <gareth@mysociety.org> | 2014-09-15 16:48:22 +0100 |
|---|---|---|
| committer | Gareth Rees <gareth@mysociety.org> | 2014-09-15 16:48:22 +0100 |
| commit | 1abc8026afed626676ce4ca156f93962b93aab3f (patch) | |
| tree | 0f22c7f2f29b3af095b483f1c0608cddbe2fef12 /app/models/censor_rule.rb | |
| parent | 6946c4b31be38b30820faed5ca782e5ad68c23d0 (diff) | |
| parent | 94364952fb08abe82a0f47a1389bbe6586fc634c (diff) | |
Merge branch 'issues/1833-censor-rule-validation' into rails-3-develop
Diffstat (limited to 'app/models/censor_rule.rb')
| -rw-r--r-- | app/models/censor_rule.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/models/censor_rule.rb b/app/models/censor_rule.rb index 3c5c77563..62cf8112f 100644 --- a/app/models/censor_rule.rb +++ b/app/models/censor_rule.rb @@ -30,7 +30,11 @@ class CensorRule < ActiveRecord::Base attr_accessor :allow_global validate :require_user_request_or_public_body, :unless => proc{ |rule| rule.allow_global == true } validate :require_valid_regexp, :if => proc{ |rule| rule.regexp? == true } - validates_presence_of :text + + validates_presence_of :text, + :replacement, + :last_edit_comment, + :last_edit_editor scope :global, {:conditions => {:info_request_id => nil, :user_id => nil, |