修改用户活动的问题
This commit is contained in:
parent
47b77eedfb
commit
eef2d8ef1a
|
@ -212,9 +212,13 @@ class UsersController < ApplicationController
|
||||||
# @activity_pages = Paginator.new @activity_count, @limit, params['page']
|
# @activity_pages = Paginator.new @activity_count, @limit, params['page']
|
||||||
# @offset ||= @activity_pages.offset
|
# @offset ||= @activity_pages.offset
|
||||||
# @events_by_day_ = @events.slice(@offset,@limit)
|
# @events_by_day_ = @events.slice(@offset,@limit)
|
||||||
watcher = User.watched_by(@user)
|
if @user == User.current
|
||||||
watcher.push(User.current)
|
watcher = User.watched_by(@user)
|
||||||
activity = Activity.where('user_id in (?)', watcher).order('id desc')
|
watcher.push(User.current)
|
||||||
|
activity = Activity.where('user_id in (?)', watcher).order('id desc')
|
||||||
|
else
|
||||||
|
activity = Activity.where('user_id = ?', @user.id).order('id desc')
|
||||||
|
end
|
||||||
@offset, @limit = api_offset_and_limit({:limit => 10})
|
@offset, @limit = api_offset_and_limit({:limit => 10})
|
||||||
@activity_count = activity.count
|
@activity_count = activity.count
|
||||||
@activity_pages = Paginator.new @activity_count, @limit, params['page']
|
@activity_pages = Paginator.new @activity_count, @limit, params['page']
|
||||||
|
|
Loading…
Reference in New Issue