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 5b2f6bcc224cfc318d1ba40c5546ec689ccd98de..262af0f8459a9ebb756371045311b52f2c609c68 100644 (file)
--- 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 4811336ab91fa57688cea023136ee438bc35f9dd..6a22876cbf63a4c98cdde53f9b1f129b32e95a1b 100644 (file)
--- a/app/views/trace/_trace_paging_nav.rhtml
+++ b/app/views/trace/_trace_paging_nav.rhtml
@@ -1,19 +1,19 @@
-<%\r
-  range_start = ((@page - 1) * @traces_per_page) + 1\r
-  range_end = (@page==@max_page ? @max_trace : (@page * @traces_per_page))\r
-%>\r
-\r
-Showing page \r
-<%= @page %> (<%= range_start %><% \r
-if (@max_trace != range_start) # if more than 1 trace on page \r
-  %>-<%= range_end %><% \r
-end %>\r
-of <%= @max_trace %>)\r
-\r
-<% if @page > 1 %>\r
-  | <%= link_to 'previous page', {:controller => 'trace', :action => @paging_action, :page => @page-1}, {:title => 'previous page'} %>\r
-<% end %>\r
-\r
-<% if @page < @max_page %>\r
-  | <%= link_to 'next page', {:controller => 'trace', :action => @paging_action, :page => @page+1}, {:title => 'next page'} %>\r
-<% end %>\r
+<%
+  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 %>