diff options
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/public_body.rb | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/app/models/public_body.rb b/app/models/public_body.rb index e88a7d05e..307c7f6b5 100644 --- a/app/models/public_body.rb +++ b/app/models/public_body.rb @@ -26,7 +26,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: public_body.rb,v 1.151 2009-09-08 02:47:55 francis Exp $ +# $Id: public_body.rb,v 1.152 2009-09-08 03:07:06 francis Exp $ require 'csv' require 'set' @@ -172,24 +172,31 @@ class PublicBody < ActiveRecord::Base def not_apply? return self.has_tag?('not_apply') end + # If tagged "defunct", then the authority no longer exists at all + def defunct? + return self.has_tag?('defunct') + end # Can an FOI (etc.) request be made to this body, and if not why not? def is_requestable? - if self.request_email.nil? + if self.defunct? return false end if self.not_apply? return false end - return !self.request_email.empty? && self.request_email != 'blank' && self.request_email != 'defunct' + if self.request_email.nil? + return false + end + return !self.request_email.empty? && self.request_email != 'blank' end def not_requestable_reason - if self.not_apply? + if self.defunct? + return 'defunct' + elsif self.not_apply? return 'not_apply' elsif self.request_email.empty? or self.request_email == 'blank' return 'bad_contact' - elsif self.request_email == 'defunct' - return 'defunct' else raise "requestable_failure_reason called with type that has no reason" end |