diff options
| -rwxr-xr-x | app/helpers/link_to_helper.rb | 7 | ||||
| -rw-r--r-- | app/views/request/show.rhtml | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb index fd9101757..16e37277b 100755 --- a/app/helpers/link_to_helper.rb +++ b/app/helpers/link_to_helper.rb @@ -116,11 +116,12 @@ module LinkToHelper end end - def user_admin_link_for_request(request) + def user_admin_link_for_request(request, external_text=nil, internal_text=nil) if request.is_external? - request.user_name + " (external)" + text = external_text ? external_text : request.user_name + " (external)" else - link_to(h(request.user.name), user_admin_url(request.user)) + text = internal_text ? internal_text : request.user.name + link_to(h(text), user_admin_url(request.user)) end end diff --git a/app/views/request/show.rhtml b/app/views/request/show.rhtml index 47fdb3693..34c7a98b0 100644 --- a/app/views/request/show.rhtml +++ b/app/views/request/show.rhtml @@ -36,14 +36,14 @@ <p class="subtitle"> <% if !@user.nil? && @user.admin_page_links? %> <%= _('{{user}} ({{user_admin_link}}) made this {{law_used_full}} request (<a href="{{request_admin_url}}">admin</a>) to {{public_body_link}} (<a href="{{public_body_admin_url}}">admin</a>)', - :user => @info_request.is_external? ? @info_request.user_name : user_link(@info_request.user), + :user => @info_request.is_external? ? (@info_request.user_name || _('An anonymous user')) : user_link(@info_request.user), :law_used_full => h(@info_request.law_used_full), - :user_admin_link => @info_request.is_external? ? _('an external user') : link_to(_('admin'), user_admin_link(@info_request.user)), + :user_admin_link => user_admin_link_for_request(@info_request, _('external'), _('admin')), :request_admin_url => request_admin_url(@info_request), :public_body_link => public_body_link(@info_request.public_body), :public_body_admin_url => public_body_admin_url(@info_request.public_body)) %> <% else %> - <%= _('{{user}} made this {{law_used_full}} request',:user=>@info_request.user.nil? ? @info_request.user_name : user_link(@info_request.user), :law_used_full=>h(@info_request.law_used_full)) %> + <%= _('{{user}} made this {{law_used_full}} request',:user=>@info_request.is_external? ? (@info_request.user_name || _('An anonymous user')) : user_link(@info_request.user), :law_used_full=>h(@info_request.law_used_full)) %> <%= _('to {{public_body}}',:public_body=>public_body_link(@info_request.public_body)) %> <% end %> </p> |