Merge branch 'release/0.21'0.21.0.0

Conflicts:
	locale/cy/app.po
	locale/es_NI/app.po
	locale/hr/app.po
	locale/is_IS/app.po
	locale/sr@latin/app.po

1 files changed, 3 insertions, 3 deletions

diff --git a/app/helpers/admin_helper.rb b/app/helpers/admin_helper.rb
index 151e53758..d13fea79b 100644
--- a/app/helpers/admin_helper.rb
+++ b/app/helpers/admin_helper.rb
@@ -21,17 +21,17 @@ module AdminHelper
 
   def request_both_links(info_request)
       link_to(eye, request_path(info_request), :title => "view request on public website") + " " +
-          link_to(info_request.title, admin_request_show_path(info_request), :title => "view full details")
+          link_to(info_request.title, admin_request_path(info_request), :title => "view full details")
   end
 
   def public_body_both_links(public_body)
       link_to(eye, public_body_path(public_body), :title => "view authority on public website") + " " +
-          link_to(h(public_body.name), admin_body_show_path(public_body), :title => "view full details")
+          link_to(h(public_body.name), admin_body_path(public_body), :title => "view full details")
   end
 
   def user_both_links(user)
       link_to(eye, user_path(user), :title => "view user's page on public website") + " " +
-        link_to(h(user.name), admin_user_show_path(user), :title => "view full details")
+        link_to(h(user.name), admin_user_path(user), :title => "view full details")
   end
 
   def comment_visibility(comment)