github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-22 09:42:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Fill acting_user field instead of target_user in history

Browse Source
This commit is contained in:
Dan Ungureanu 2020-06-16 13:30:58 +03:00
parent 219bb0b6a7
commit 84dfaad137
No known key found for this signature in database
GPG Key ID: 0AA2A00D6ACC8B84
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/users_controller.rb
View File

@ -232,7 +232,7 @@ class UsersController < ApplicationController
if current_user.staff? && current_user != user
StaffActionLogger.new(current_user).log_update_email(user)
else
UserHistory.create!(action: UserHistory.actions[:update_email], target_user_id: user.id)
UserHistory.create!(action: UserHistory.actions[:update_email], acting_user_id: user.id)
end
end
@ -264,7 +264,7 @@ class UsersController < ApplicationController
if current_user.staff? && current_user != user
StaffActionLogger.new(current_user).log_destroy_email(user)
else
UserHistory.create(action: UserHistory.actions[:destroy_email], target_user_id: user.id)
UserHistory.create(action: UserHistory.actions[:destroy_email], acting_user_id: user.id)
end
end

2
lib/email_updater.rb
View File

@ -38,7 +38,7 @@ class EmailUpdater
if @guardian.is_staff? && @guardian.user != @user
StaffActionLogger.new(@guardian.user).log_add_email(@user)
else
UserHistory.create!(action: UserHistory.actions[:add_email], target_user_id: @user.id)
UserHistory.create!(action: UserHistory.actions[:add_email], acting_user_id: @user.id)
end
if @guardian.is_staff? && !@user.staff?