Passing parameters to pagination of events saves a few conditionals in UsersController

- Will_paginate discards empty :params, letting us specify custom URL parameters where applicable (for pagination)

2 files changed, 3 insertions, 3 deletions

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 7bce668..3f88529 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -41,25 +41,25 @@ class UsersController < ApplicationController
   def activities
     respond_to do |wants|
       wants.js do
+        @event_pagination_params = {:action => "show"}
         render :partial => "events/events", :locals => {:events => @user.events_in_watchlist.paginate(
             :page => params[:page],
             :order => "events.created_at desc",
             :include => [:user, :project]
             )}
       end
-      wants.html {redirect_to :action => :show, :page => params[:page]}
     end
   end
 
   def watched_activities
     respond_to do |wants|
       wants.js do
+        @event_pagination_params = {:action => "show", :events => "watched"}
         render :partial => "events/events", :locals => {:events => @user.events_as_target.paginate(
             :page => params[:page],
             :include =>  [:user, :project]
             )}
       end
-      wants.html {redirect_to :action => :show, :page => params[:page], :events => "watched"}
     end
   end
   
diff --git a/app/views/events/_events.html.erb b/app/views/events/_events.html.erb
index 8b009f0..8cfaeb6 100644
--- a/app/views/events/_events.html.erb
+++ b/app/views/events/_events.html.erb
@@ -32,5 +32,5 @@
   </li>
 <% end -%>
 </ul>
-<%= will_paginate events -%>
+<%= will_paginate events, :params => @event_pagination_params -%>
 <% end -%>