forked from treehouse/mastodon
Fix 404 error when filtering admin action logs by non-existent target account (#16643)
Currently, there is no way for an admin to delete an account record. However, should that happen in the future, or should an admin mistype an account id, `/admin/action_logs?target_account_id=<non-existent-account-id>` currently returns a 404 instead of an empty list. With this commit, the aforementioned page returns a correct list instead (potentially non-empty if the account has been manually deleted)rebase/4.0.0rc2
parent
032d9bcaed
commit
9b978872cc
|
@ -76,7 +76,7 @@ class Admin::ActionLogFilter
|
|||
when 'account_id'
|
||||
Admin::ActionLog.where(account_id: value)
|
||||
when 'target_account_id'
|
||||
account = Account.find(value)
|
||||
account = Account.find_or_initialize_by(id: value)
|
||||
Admin::ActionLog.where(target: [account, account.user].compact)
|
||||
else
|
||||
raise "Unknown filter: #{key}"
|
||||
|
|
Loading…
Reference in New Issue