aboutsummaryrefslogtreecommitdiffstats
path: root/app/models/public_body.rb
diff options
context:
space:
mode:
authorHenare Degan <henare.degan@gmail.com>2013-03-03 14:52:30 +1100
committerHenare Degan <henare.degan@gmail.com>2013-03-03 14:52:30 +1100
commitcbdff06aa95a7987b54c712dc6729e138f608eca (patch)
treeb101dd575c5cab97675c0ac488e68fa6cbd0c4fd /app/models/public_body.rb
parentf02881b5bf5cc4d633983100078be2e64b8e6fcc (diff)
Rename Configuration class to avoid conflict with ActiveSupport::Configurable
Diffstat (limited to 'app/models/public_body.rb')
-rw-r--r--app/models/public_body.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/public_body.rb b/app/models/public_body.rb
index a06e0d253..a76aeb189 100644
--- a/app/models/public_body.rb
+++ b/app/models/public_body.rb
@@ -332,7 +332,7 @@ class PublicBody < ActiveRecord::Base
pb = PublicBody.new(
:name => 'Internal admin authority',
:short_name => "",
- :request_email => Configuration::contact_email,
+ :request_email => AlaveteliConfiguration::contact_email,
:home_page => "",
:notes => "",
:publication_scheme => "",
@@ -548,7 +548,7 @@ class PublicBody < ActiveRecord::Base
# Returns nil if configuration variable not set
def override_request_email
- e = Configuration::override_all_public_body_request_emails
+ e = AlaveteliConfiguration::override_all_public_body_request_emails
e if e != ""
end