From: Tom Hughes <tom@compton.nu>
Date: Sun, 10 Jun 2007 23:51:23 +0000 (+0000)
Subject: Make next and previous links on user/XXX/traces work. Fixes #501.
X-Git-Tag: live~8396
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/4012eb7f9a723a27ddf42615eec5d4c27e1e2534

Make next and previous links on user/XXX/traces work. Fixes #501.
---

diff --git a/app/controllers/trace_controller.rb b/app/controllers/trace_controller.rb
index 5b2f6bcc2..262af0f84 100644
--- a/app/controllers/trace_controller.rb
+++ b/app/controllers/trace_controller.rb
@@ -13,6 +13,8 @@ class TraceController < ApplicationController
     # from display name, pick up user id if one user's traces only
     display_name = params[:display_name]
     if target_user.nil? and display_name and display_name != ''
+      @paging_action = 'view'
+      @display_name = display_name
       target_user = User.find(:first, :conditions => [ "display_name = ?", display_name])
     end
 
diff --git a/app/views/trace/_trace_paging_nav.rhtml b/app/views/trace/_trace_paging_nav.rhtml
index 4811336ab..6a22876cb 100644
--- a/app/views/trace/_trace_paging_nav.rhtml
+++ b/app/views/trace/_trace_paging_nav.rhtml
@@ -1,19 +1,19 @@
-<%
-  range_start = ((@page - 1) * @traces_per_page) + 1
-  range_end = (@page==@max_page ? @max_trace : (@page * @traces_per_page))
-%>
-
-Showing page 
-<%= @page %> (<%= range_start %><% 
-if (@max_trace != range_start) # if more than 1 trace on page 
-  %>-<%= range_end %><% 
-end %>
-of <%= @max_trace %>)
-
-<% if @page > 1 %>
-  | <%= link_to 'previous page', {:controller => 'trace', :action => @paging_action, :page => @page-1}, {:title => 'previous page'} %>
-<% end %>
-
-<% if @page < @max_page %>
-  | <%= link_to 'next page', {:controller => 'trace', :action => @paging_action, :page => @page+1}, {:title => 'next page'} %>
-<% end %>
+<%
+  range_start = ((@page - 1) * @traces_per_page) + 1
+  range_end = (@page==@max_page ? @max_trace : (@page * @traces_per_page))
+%>
+
+Showing page 
+<%= @page %> (<%= range_start %><% 
+if (@max_trace != range_start) # if more than 1 trace on page 
+  %>-<%= range_end %><% 
+end %>
+of <%= @max_trace %>)
+
+<% if @page > 1 %>
+  | <%= link_to 'previous page', {:controller => 'trace', :display_name => @display_name, :action => @paging_action, :page => @page-1}, {:title => 'previous page'} %>
+<% end %>
+
+<% if @page < @max_page %>
+  | <%= link_to 'next page', {:controller => 'trace', :display_name => @display_name, :action => @paging_action, :page => @page+1}, {:title => 'next page'} %>
+<% end %>