diff options
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/info_request.rb | 2 | ||||
| -rw-r--r-- | app/models/public_body.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/models/info_request.rb b/app/models/info_request.rb index 9290ab77d..83456b54f 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -997,7 +997,7 @@ public # Call groups of censor rules def apply_censor_rules_to_text!(text) - applicable_rules = [self.censor_rules, CensorRule.global.all] + applicable_rules = [self.censor_rules, self.public_body.censor_rules, CensorRule.global.all] if self.user && !self.user.censor_rules.empty? applicable_rules << self.user.censor_rules end diff --git a/app/models/public_body.rb b/app/models/public_body.rb index 97802c7e8..60ecb2781 100644 --- a/app/models/public_body.rb +++ b/app/models/public_body.rb @@ -42,6 +42,7 @@ class PublicBody < ActiveRecord::Base has_many :info_requests, :order => 'created_at desc' has_many :track_things, :order => 'created_at desc' + has_many :censor_rules, :order => 'created_at desc' has_tag_string |