From cb326c18d586220c6196b66c2af22dce250dbc06 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Tue, 14 Jan 2014 17:03:45 +0000 Subject: Link 'anonymous' users to help section with explanation. Requests submitted using the write API may have an anonymous user. Add a section to the FAQ explaining this, and link to it from those requests. Note this commit removes some 'h' calls that are no longer needed in Rails 3. Contributes to https://github.com/mysociety/alaveteli/issues/1286 --- app/helpers/link_to_helper.rb | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) (limited to 'app/helpers/link_to_helper.rb') diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb index 8df28f350..433a34da9 100755 --- a/app/helpers/link_to_helper.rb +++ b/app/helpers/link_to_helper.rb @@ -121,24 +121,37 @@ module LinkToHelper end def user_link_absolute(user) - link_to h(user.name), user_url(user) + link_to user.name, user_url(user) end def user_link(user) - link_to h(user.name), user_path(user) + link_to user.name, user_path(user) end - def request_user_link_absolute(request) + def external_user_link(request, absolute=false, text) + if request.external_user_name + request.external_user_name + else + if absolute + url = help_privacy_url(:anchor => 'anonymous') + else + url = help_privacy_path(:anchor => 'anonymous') + end + link_to(text, url) + end + end + + def request_user_link_absolute(request, anonymous_text=_("Anonymous user")) if request.is_external? - request.external_user_name || _("Anonymous user") + external_user_link(request, absolute=true, anonymous_text) else user_link_absolute(request.user) end end - def request_user_link(request) + def request_user_link(request, anonymous_text=_("Anonymous user")) if request.is_external? - request.external_user_name || _("Anonymous user") + external_user_link(request, anonymous_text) else user_link(request.user) end -- cgit v1.2.3 From 90fd29903b9db724c941b6e6efa39f41313e8825 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Tue, 28 Jan 2014 16:32:06 +0000 Subject: Pass explicit value for absolute Previous syntax broken under Ruby 1.8.7. --- app/helpers/link_to_helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/helpers/link_to_helper.rb') diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb index 433a34da9..405886a85 100755 --- a/app/helpers/link_to_helper.rb +++ b/app/helpers/link_to_helper.rb @@ -128,7 +128,7 @@ module LinkToHelper link_to user.name, user_path(user) end - def external_user_link(request, absolute=false, text) + def external_user_link(request, absolute, text) if request.external_user_name request.external_user_name else @@ -151,7 +151,7 @@ module LinkToHelper def request_user_link(request, anonymous_text=_("Anonymous user")) if request.is_external? - external_user_link(request, anonymous_text) + external_user_link(request, absolute=false, anonymous_text) else user_link(request.user) end -- cgit v1.2.3