github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-01 03:45:06 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Use ResultSet with staff action logs. (#7661)

Browse Source
This commit is contained in:
Bianca Nenciu
2019-08-13 20:55:05 +03:00
committed by GitHub
parent 296cdc53ee
commit ba396a5384
9 changed files with 122 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/user_history.rb
View File

@ -222,14 +222,9 @@ class UserHistory < ActiveRecord::Base
opts[:action_id] = self.actions[opts[:action_name].to_sym] if opts[:action_name]
end
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?