Commit 99682502 authored by Dmytro Zaporozhets's avatar Dmytro Zaporozhets 🌴

Add inifinite scroll to user activity on user page

parent 29f6b01d
Pipeline #7996 failed with stage
......@@ -23,6 +23,7 @@ v 7.10.0 (unreleased)
- Restrict permissions on backup files
- Improve oauth accounts UI in profile page
- Add ability to unlink connected accounts
- Add inifinite scroll to user page activity
v 7.9.0 (unreleased)
- Add HipChat integration documentation (Stan Hu)
......
......@@ -97,6 +97,7 @@ class Dispatcher
new ProjectFork()
when 'users:show'
new User()
new Activities()
switch path.first()
when 'admin'
......
......@@ -16,17 +16,16 @@ class UsersController < ApplicationController
# Collect only groups common for both users
@groups = @user.groups & GroupsFinder.new.execute(current_user)
# Get user activity feed for projects common for both users
@events = @user.recent_events.
where(project_id: authorized_projects_ids).
with_associations.limit(30)
@title = @user.name
@title_url = user_path(@user)
respond_to do |format|
format.html
format.atom { render layout: false }
format.json do
load_events
pager_json("events/_events", @events.count)
end
end
end
......@@ -82,4 +81,13 @@ class UsersController < ApplicationController
@authorized_projects_ids ||=
ProjectsFinder.new.execute(current_user).pluck(:id)
end
def load_events
# Get user activity feed for projects common for both users
@events = @user.recent_events.
where(project_id: authorized_projects_ids).
with_associations
@events = @events.limit(20).offset(params[:offset] || 0)
end
end
......@@ -40,7 +40,8 @@
%strong
%i.fa.fa-rss
= render @events
.content_list
= spinner
%aside.col-md-4
= render 'profile', user: @user
= render 'projects'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment