Inline helper method

3 files changed, 8 insertions, 12 deletions

diff --git a/app/controllers/admin_user_controller.rb b/app/controllers/admin_user_controller.rb
index 1478cb21f..feffa208e 100644
--- a/app/controllers/admin_user_controller.rb
+++ b/app/controllers/admin_user_controller.rb
@@ -48,7 +48,7 @@ class AdminUserController < AdminController
         if @admin_user.valid?
             @admin_user.save!
             flash[:notice] = 'User successfully updated.'
-            redirect_to user_admin_url(@admin_user)
+            redirect_to admin_user_show_url(@admin_user)
         else
             render :action => 'edit'
         end
@@ -58,7 +58,7 @@ class AdminUserController < AdminController
         track_thing = TrackThing.find(params[:track_id].to_i)
         track_thing.destroy
         flash[:notice] = 'Track destroyed'
-        redirect_to user_admin_url(track_thing.tracking_user)
+        redirect_to admin_user_show_url(track_thing.tracking_user)
     end
 
     def clear_bounce
@@ -66,7 +66,7 @@ class AdminUserController < AdminController
         user.email_bounced_at = nil
         user.email_bounce_message = ""
         user.save!
-        redirect_to user_admin_url(user)
+        redirect_to admin_user_show_url(user)
     end
 
     def login_as
@@ -91,7 +91,7 @@ class AdminUserController < AdminController
         end
 
         flash[:notice] = "Profile photo cleared"
-        redirect_to user_admin_url(@admin_user)
+        redirect_to admin_user_show_url(@admin_user)
     end
 
     private
diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb
index 0af4570ab..a2286825f 100755
--- a/app/helpers/link_to_helper.rb
+++ b/app/helpers/link_to_helper.rb
@@ -133,7 +133,7 @@ module LinkToHelper
             text = external_text ? external_text : (request.external_user_name || _("Anonymous user")) + " (external)"
         else
             text = internal_text ? internal_text : request.user.name
-            link_to(h(text), user_admin_url(request.user))
+            link_to(h(text), admin_user_show_url(request.user))
         end
     end
 
@@ -181,16 +181,12 @@ module LinkToHelper
         link_to user_or_you_capital(user), user_path(user)
     end
 
-    def user_admin_url(user)
-        admin_user_show_url(user)
-    end
-
     def user_admin_link(user, name="admin", cls=nil)
-      link_to name, user_admin_url(user), :class => cls
+      link_to name, admin_user_show_url(user), :class => cls
     end
 
     def user_both_links(user)
-        link_to(h(user.name), user_url(user)) + " (" + link_to("admin", user_admin_url(user)) + ")"
+        link_to(h(user.name), user_url(user)) + " (" + link_to("admin", admin_user_show_url(user)) + ")"
     end
 
     # Tracks. feed can be 'track' or 'feed'
diff --git a/app/views/user/show.rhtml b/app/views/user/show.rhtml
index c61993688..49e700ecb 100644
--- a/app/views/user/show.rhtml
+++ b/app/views/user/show.rhtml
@@ -66,7 +66,7 @@
     <p class="subtitle">
        <%= _('Joined {{site_name}} in', :site_name=>site_name) %> <%= year_from_date(@display_user.created_at) %>
         <% if !@user.nil? && @user.admin_page_links? %>
-        (<%= link_to "admin", user_admin_url(@display_user) %>)
+        (<%= link_to "admin", admin_user_show_url(@display_user) %>)
         <% end %>
     </p>