aboutsummaryrefslogtreecommitdiffstats
path: root/app/helpers/link_to_helper.rb
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2012-08-13 11:26:24 +0100
committerLouise Crow <louise.crow@gmail.com>2012-08-13 11:26:24 +0100
commitef7ce0a2918ef37d140a8fc13f0aef1565f1279c (patch)
treeb7c71e0504ae23c08991c93fe9f584a94b9a5cde /app/helpers/link_to_helper.rb
parentdeb7c8c30191a7dedb90219beef1717e404c3f65 (diff)
parentb8eb037d671021ed1604e4ab907c84fe16211e5a (diff)
Merge branch 'develop' of github.com:sebbacon/alaveteli into develop
Diffstat (limited to 'app/helpers/link_to_helper.rb')
-rwxr-xr-xapp/helpers/link_to_helper.rb14
1 files changed, 13 insertions, 1 deletions
diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb
index 01332c5ab..d0bb56abf 100755
--- a/app/helpers/link_to_helper.rb
+++ b/app/helpers/link_to_helper.rb
@@ -95,11 +95,23 @@ module LinkToHelper
end
def user_link_for_request(request, cls=nil)
if request.is_external?
- request.external_user_name || _("Anonymous user")
+ user_name = request.external_user_name || _("Anonymous user")
+ if !request.external_url.nil?
+ link_to h(user_name), request.external_url
+ else
+ user_name
+ end
else
link_to h(request.user.name), user_url(request.user), :class => cls
end
end
+ def user_admin_link_for_request(request)
+ if request.is_external?
+ request.user_name + " (external)"
+ else
+ link_to(h(request.user.name), user_admin_url(request.user))
+ end
+ end
def user_link_absolute(user)
link_to h(user.name), main_url(user_url(user))