diff options
| author | Robin Houston <robin@lenny.robin> | 2011-07-13 16:57:36 +0100 |
|---|---|---|
| committer | Robin Houston <robin@lenny.robin> | 2011-07-13 16:57:36 +0100 |
| commit | 2de25616eaa4bacf1cd61c54f939a44f03a10263 (patch) | |
| tree | 120cd36125b9b2197ec63ee35af30f5df9c51c4a /app/models/info_request.rb | |
| parent | 3d5c9dee092962aa1169243535e93eab3915cd7f (diff) | |
| parent | b05ce7cc350318ecf111529e77c40b128f7c0d05 (diff) | |
Merge branch 'master' of git@github.com:sebbacon/alaveteli
Diffstat (limited to 'app/models/info_request.rb')
| -rw-r--r-- | app/models/info_request.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/info_request.rb b/app/models/info_request.rb index f7a8f58a2..dcef9e5b5 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -94,7 +94,6 @@ class InfoRequest < ActiveRecord::Base 'requires_admin', 'user_withdrawn' ] - if @@custom_states_loaded states += InfoRequest.theme_extra_states end @@ -108,7 +107,8 @@ class InfoRequest < ActiveRecord::Base @@custom_states_loaded = false begin - if !ENV["RAILS_ENV"] == "test" + if ENV["RAILS_ENV"] != "test" + require 'customstates' include InfoRequestCustomStates @@custom_states_loaded = true end |