IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: bug when revoking badge as title (#8616)

Browse Source 
When user revokes badge as title, UserHistory item is created. However,
that object is not accepting revoke_reson parameter.
This commit is contained in:
Krzysztof Kotlarek
2019-12-24 08:03:51 +11:00
committed by GitHub
parent 63323bd7a8
commit ac626a0dc3
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/users_controller.rb
View File

@@ -215,12 +215,13 @@ class UsersController < ApplicationController
user.save!
log_params = {
revoke_reason: 'user title was same as revoked badge name or custom badge name',
previous_value: previous_title
}
if current_user.staff? && current_user != user
StaffActionLogger.new(current_user).log_title_revoke(user, log_params)
StaffActionLogger
.new(current_user)
.log_title_revoke(user, log_params.merge(revoke_reason: 'user title was same as revoked badge name or custom badge name'))
else
UserHistory.create!(log_params.merge(target_user_id: user.id, action: UserHistory.actions[:revoke_title]))
end