diff options
| -rw-r--r-- | app/models/user.rb | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 553846d..9518192 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -378,11 +378,13 @@ class User < ActiveRecord::Base end def paginated_events_in_watchlist(pagination_options = {}) - watched_event_ids = feed_items.paginate({ - :order => "created_at desc" - }.merge(pagination_options)).map(&:event_id) - Event.paginate(watched_event_ids, - {:order => "created_at desc"}.merge(pagination_options)) + watched = feed_items.paginate({ + :order => "created_at desc", + :total_entries => FeedItem.per_page+(FeedItem.per_page+1) + }.merge(pagination_options)) + items = WillPaginate::Collection.new(watched.current_page, watched.per_page, + watched.total_entries) + items.replace(Event.find(watched.map(&:event_id), {:order => "created_at desc"})) end protected |