diff options
| -rw-r--r-- | app/models/info_request.rb | 5 | ||||
| -rw-r--r-- | spec/models/info_request_spec.rb | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/app/models/info_request.rb b/app/models/info_request.rb index aaed99d81..a79ede809 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -1079,7 +1079,10 @@ public # Get the list of censor rules that apply to this request def applicable_censor_rules - applicable_rules = [self.censor_rules, self.public_body.censor_rules, CensorRule.global.all] + applicable_rules = [self.censor_rules, CensorRule.global.all] + unless is_batch_request_template? + applicable_rules << self.public_body.censor_rules + end if self.user && !self.user.censor_rules.empty? applicable_rules << self.user.censor_rules end diff --git a/spec/models/info_request_spec.rb b/spec/models/info_request_spec.rb index be9206ad1..0c6457b1a 100644 --- a/spec/models/info_request_spec.rb +++ b/spec/models/info_request_spec.rb @@ -613,6 +613,12 @@ describe InfoRequest do @info_request.apply_censor_rules_to_text!(@text) end + it 'should not raise an error if the request is a batch request template' do + @info_request.stub!(:public_body).and_return(nil) + @info_request.is_batch_request_template = true + lambda{ @info_request.apply_censor_rules_to_text!(@text) }.should_not raise_error + end + end context 'when applying censor rules to binary files' do |