Merge branch 'develop' of github.com:sebbacon/alaveteli into develop

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))