diff options
| author | Matthew Landauer <matthew@openaustralia.org> | 2012-09-25 08:55:35 +1000 |
|---|---|---|
| committer | Matthew Landauer <matthew@openaustralia.org> | 2012-09-25 08:55:35 +1000 |
| commit | f59700138f7360436767fddea554c739e2cd484b (patch) | |
| tree | 8c3af52f3f1f369ab412fa7571f19860e4f260b8 /app/controllers/admin_request_controller.rb | |
| parent | 265e336ae0608af39aa3aad8b27862e572222562 (diff) | |
Extract configuration with defaults into one module
Diffstat (limited to 'app/controllers/admin_request_controller.rb')
| -rw-r--r-- | app/controllers/admin_request_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/admin_request_controller.rb b/app/controllers/admin_request_controller.rb index 53ff2957b..b8f2de968 100644 --- a/app/controllers/admin_request_controller.rb +++ b/app/controllers/admin_request_controller.rb @@ -42,9 +42,9 @@ class AdminRequestController < AdminController # XXX is this *really* the only way to render a template to a # variable, rather than to the response? vars = OpenStruct.new(:name_to => @info_request.user_name, - :name_from => MySociety::Config.get("CONTACT_NAME", 'Alaveteli'), + :name_from => Configuration::contact_name, :info_request => @info_request, :reason => params[:reason], - :info_request_url => 'http://' + MySociety::Config.get('DOMAIN') + request_url(@info_request), + :info_request_url => 'http://' + Configuration::domain + request_url(@info_request), :site_name => site_name) template = File.read(File.join(File.dirname(__FILE__), "..", "views", "admin_request", "hidden_user_explanation.rhtml")) @request_hidden_user_explanation = ERB.new(template).result(vars.instance_eval { binding }) |