diff options
| -rwxr-xr-x | app/helpers/link_to_helper.rb | 6 | ||||
| -rw-r--r-- | app/views/public_body/show.rhtml | 2 | ||||
| -rw-r--r-- | app/views/request/show.rhtml | 2 |
3 files changed, 3 insertions, 7 deletions
diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb index 2c4a30eda..0af4570ab 100755 --- a/app/helpers/link_to_helper.rb +++ b/app/helpers/link_to_helper.rb @@ -98,12 +98,8 @@ module LinkToHelper link_to h(public_body.name), public_body_url(public_body) end - def public_body_admin_url(public_body) - admin_body_show_url(public_body) - end - def public_body_both_links(public_body) - link_to(h(public_body.name), public_body_url(public_body)) + " (" + link_to("admin", public_body_admin_url(public_body)) + ")" + link_to(h(public_body.name), public_body_url(public_body)) + " (" + link_to("admin", admin_body_show_url(public_body)) + ")" end # Users diff --git a/app/views/public_body/show.rhtml b/app/views/public_body/show.rhtml index b3fe1a9b8..a4c57305a 100644 --- a/app/views/public_body/show.rhtml +++ b/app/views/public_body/show.rhtml @@ -37,7 +37,7 @@ <%=@public_body.type_of_authority(true)%><% if not @public_body.short_name.empty? %>, <%= _('also called {{public_body_short_name}}', :public_body_short_name => h(@public_body.short_name))%><% end %> <% if !@user.nil? && @user.admin_page_links? %> - (<%= link_to _("admin"), public_body_admin_url(@public_body) %>) + (<%= link_to _("admin"), admin_body_show_url(@public_body) %>) <% end %> </p> diff --git a/app/views/request/show.rhtml b/app/views/request/show.rhtml index b3dba4d4f..ef49ef958 100644 --- a/app/views/request/show.rhtml +++ b/app/views/request/show.rhtml @@ -39,7 +39,7 @@ :user_admin_link => user_admin_link_for_request(@info_request, _('external'), _('admin')), :request_admin_url => admin_request_show_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)) %> + :public_body_admin_url => admin_body_show_url(@info_request.public_body)) %> <% else %> <%= _('{{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)) %> |