Render the correct events on the AJAX action too

1 files changed, 5 insertions, 6 deletions

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index cdff34a..1060b8f 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -43,7 +43,7 @@ class UsersController < ApplicationController
       wants.js do
         @event_pagination_params = {:action => "show"}
         render(:partial => "events/events", :locals => {
-            :events => @user.events_in_watchlist.paginate({
+            :events => @user.events.paginate({
                 :page => params[:page],
                 :order => "events.created_at desc",
                 :include => [:user, :project]
@@ -54,16 +54,15 @@ class UsersController < ApplicationController
   end
 
   def watched_activities
+    @events = @user.events_in_watchlist.paginate(:page => params[:page],
+      :include => [:user, :project])
     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],
-                :order => "events.created_at desc",
-                :include =>  [:user, :project]
-              })
+            :events => @events
           })
+        render :partial => "events/events", :locals => {:events => @events}
       end
     end
   end