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

FIX: ensure offset is always positive

Browse Source
This commit is contained in:
Régis Hanol
2019-08-20 12:03:16 +02:00
parent 727430aacf
commit d18c9b2d4d
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/controllers/user_actions_controller.rb
View File

@ -6,18 +6,17 @@ class UserActionsController < ApplicationController
params.require(:username) params.require(:username)
params.permit(:filter, :offset, :acting_username) params.permit(:filter, :offset, :acting_username)
per_chunk = 30
user = fetch_user_from_params(include_inactive: current_user.try(:staff?) || (current_user && SiteSetting.show_inactive_accounts)) user = fetch_user_from_params(include_inactive: current_user.try(:staff?) || (current_user && SiteSetting.show_inactive_accounts))
raise Discourse::NotFound unless guardian.can_see_profile?(user) raise Discourse::NotFound unless guardian.can_see_profile?(user)
offset = [0, params[:offset].to_i].max
action_types = (params[:filter] || "").split(",").map(&:to_i) action_types = (params[:filter] || "").split(",").map(&:to_i)
opts = { opts = {
user_id: user.id, user_id: user.id,
user: user, user: user,
offset: params[:offset].to_i, offset: offset,
limit: per_chunk, limit: 30,
action_types: action_types, action_types: action_types,
guardian: guardian, guardian: guardian,
ignore_private_messages: params[:filter] ? false : true, ignore_private_messages: params[:filter] ? false : true,
@ -25,7 +24,7 @@ class UserActionsController < ApplicationController
} }
stream = UserAction.stream(opts).to_a stream = UserAction.stream(opts).to_a
if stream.length == 0 && (help_key = params['no_results_help_key']) if stream.empty? && (help_key = params['no_results_help_key'])
if user.id == guardian.user.try(:id) if user.id == guardian.user.try(:id)
help_key += ".self" help_key += ".self"
else else