From 03a875ae16520d7a5fc1c5e8f7e607c7fa6aded2 Mon Sep 17 00:00:00 2001
From: Louise Crow <louise.crow@gmail.com>
Date: Tue, 14 Aug 2012 11:34:24 +0100
Subject: Add association between public bodies and censor rules, have
 info_request apply rules from its public body.

---
 app/models/info_request.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/models/info_request.rb')

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
-- 
cgit v1.2.3