diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-08-22 10:08:57 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-08-22 10:08:57 +0100 |
| commit | 2939511069bbafe45a53174da4c5bd880ac109a8 (patch) | |
| tree | ed1702891a19e04875f7a6873e813a27f053a24d | |
| parent | dce7797d92cafc29c50fe5b91e62874f10659846 (diff) | |
Use user_name instead of user.name to handle external requests.
| -rw-r--r-- | app/controllers/services_controller.rb | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/app/controllers/services_controller.rb b/app/controllers/services_controller.rb index 8fa860fb2..40e0faaf7 100644 --- a/app/controllers/services_controller.rb +++ b/app/controllers/services_controller.rb @@ -3,13 +3,14 @@ require 'open-uri' class ServicesController < ApplicationController + def other_country_message text = "" iso_country_code = MySociety::Config.get('ISO_COUNTRY_CODE').downcase if country_from_ip.downcase != iso_country_code found_country = WorldFOIWebsites.by_code(country_from_ip) found_country_name = !found_country.nil? && found_country[:country_name] - + old_fgt_locale = FastGettext.locale begin FastGettext.locale = FastGettext.best_locale_in(request.env['HTTP_ACCEPT_LANGUAGE']) @@ -28,15 +29,17 @@ class ServicesController < ApplicationController end render :text => text, :content_type => "text/plain" # XXX workaround the HTML validation in test suite end + def hidden_user_explanation info_request = InfoRequest.find(params[:info_request_id]) - render :template => "admin_request/hidden_user_explanation", + render :template => "admin_request/hidden_user_explanation", :content_type => "text/plain", :layout => false, - :locals => {:name_to => info_request.user.name, - :name_from => MySociety::Config.get("CONTACT_NAME", 'Alaveteli'), + :locals => {:name_to => info_request.user_name, + :name_from => MySociety::Config.get("CONTACT_NAME", 'Alaveteli'), :info_request => info_request, :reason => params[:reason], :info_request_url => 'http://' + MySociety::Config.get('DOMAIN') + request_url(info_request), :site_name => site_name} end + end |