github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-30 07:11:34 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FEATURE: Make staff action logs page support infinite loading

Browse Source
This commit is contained in:
Bianca Nenciu
2019-06-06 06:02:53 +03:00
committed by Sam
parent b510006ca8
commit e0c821ebb0
5 changed files with 176 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/models/user_history.rb
View File

@ -216,7 +216,16 @@ class UserHistory < ActiveRecord::Base
opts[:action_id] = self.actions[opts[:action_name].to_sym] if opts[:action_name]
end
query = self.with_filters(opts.slice(*staff_filters)).only_staff_actions.limit(200).order('id DESC').includes(:acting_user, :target_user)
page = (opts[:page] || 0).to_i
page_size = (opts[:limit] || 200).to_i
query = self
.with_filters(opts.slice(*staff_filters))
.only_staff_actions
.limit(page_size)
.offset(page * page_size)
.order('id DESC')
.includes(:acting_user, :target_user)
query = query.where(admin_only: false) unless viewer && viewer.admin?
query
end