aboutsummaryrefslogtreecommitdiffstats
path: root/app/helpers
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2014-12-18 15:42:53 +0000
committerLouise Crow <louise.crow@gmail.com>2014-12-18 15:42:53 +0000
commitbbdcb09cb9eeb94e3244a22b1129a1e9521947f4 (patch)
tree4ad15f4138796087c32957261e8b9e7b6f59887b /app/helpers
parent5cfcdaac505e60914ee4398cfe431bd5d21b58ed (diff)
parentabdc92fd922dd82da85f7c00bdb50e85ed047714 (diff)
Merge branch 'restful-admin-routes' into rails-3-develop
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/admin_helper.rb6
-rwxr-xr-xapp/helpers/link_to_helper.rb4
2 files changed, 5 insertions, 5 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)
diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb
index 3709469cf..44d6c6f5f 100755
--- a/app/helpers/link_to_helper.rb
+++ b/app/helpers/link_to_helper.rb
@@ -116,7 +116,7 @@ module LinkToHelper
if request.is_external?
external_text || (request.external_user_name || _("Anonymous user")) + " (external)"
else
- link_to(internal_text || request.user.name, admin_user_show_url(request.user))
+ link_to(internal_text || request.user.name, admin_user_url(request.user))
end
end
@@ -178,7 +178,7 @@ module LinkToHelper
end
def user_admin_link(user, name="admin", cls=nil)
- link_to name, admin_user_show_url(user), :class => cls
+ link_to name, admin_user_url(user), :class => cls
end
# Tracks. feed can be 'track' or 'feed'