diff options
author | Seb Bacon <seb.bacon@gmail.com> | 2011-07-25 15:01:20 +0100 |
---|---|---|
committer | Seb Bacon <seb.bacon@gmail.com> | 2011-07-25 15:01:20 +0100 |
commit | 1e33a67f9e3e282ce83c18127624f74bb5840549 (patch) | |
tree | 1801cdcd7e6c6d470c366c997e0097116ebe6e53 | |
parent | a51aa8a93246e6c10efec14dec8efbdf3301db5f (diff) |
Rescue NameErrors when attempting to load custom states (for the case where the file exists, but it's empty)
-rw-r--r-- | app/controllers/request_controller.rb | 2 | ||||
-rw-r--r-- | app/models/info_request.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb index 81dffaa80..80246c811 100644 --- a/app/controllers/request_controller.rb +++ b/app/controllers/request_controller.rb @@ -19,7 +19,7 @@ class RequestController < ApplicationController include RequestControllerCustomStates @@custom_states_loaded = true end - rescue MissingSourceFile + rescue MissingSourceFile, NameError end def show diff --git a/app/models/info_request.rb b/app/models/info_request.rb index e6a520fd2..209954b16 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -112,7 +112,7 @@ class InfoRequest < ActiveRecord::Base include InfoRequestCustomStates @@custom_states_loaded = true end - rescue MissingSourceFile + rescue MissingSourceFile, NameError end # only check on create, so existing models with mixed case are allowed |