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: invite approval StaffActionLogger bug (#7151)

Browse Source 
* FIX: invite approval `StaffActionLogger` bug
This commit is contained in:
Tarek Khalil
2019-03-12 13:32:25 +00:00
committed by GitHub
parent 6d0528687d
commit 4a00772c19
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/models/user.rb
View File

@@ -405,23 +405,17 @@ class User < ActiveRecord::Base
end
# Approve this user
def approve(approved_by, send_mail = true)
def approve(approver, send_mail = true)
self.approved = true
if approved_by.is_a?(Integer)
self.approved_by_id = approved_by
else
self.approved_by = approved_by
end
self.approved_at = Time.zone.now
self.approved_by = approver
if result = save
send_approval_email if send_mail
DiscourseEvent.trigger(:user_approved, self)
end
StaffActionLogger.new(approved_by).log_user_approve(self)
StaffActionLogger.new(approver).log_user_approve(self)
result
end