Fix notifications about deleted reports not being also deleted (#19475)
* Fix notifications about deleted reports not being also deleted * Fix notification with empty report crashing web UI Fix #18909
This commit is contained in:
parent
f6bcf86caf
commit
d2eb726962
2 changed files with 5 additions and 0 deletions
|
@ -372,6 +372,10 @@ class Notification extends ImmutablePureComponent {
|
|||
renderAdminReport (notification, account, link) {
|
||||
const { intl, unread, report } = this.props;
|
||||
|
||||
if (!report) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const targetAccount = report.get('target_account');
|
||||
const targetDisplayNameHtml = { __html: targetAccount.get('display_name_html') };
|
||||
const targetLink = <bdi><Permalink className='notification__display-name' href={targetAccount.get('url')} title={targetAccount.get('acct')} to={`/@${targetAccount.get('acct')}`} dangerouslySetInnerHTML={targetDisplayNameHtml} /></bdi>;
|
||||
|
|
|
@ -33,6 +33,7 @@ class Report < ApplicationRecord
|
|||
belongs_to :assigned_account, class_name: 'Account', optional: true
|
||||
|
||||
has_many :notes, class_name: 'ReportNote', foreign_key: :report_id, inverse_of: :report, dependent: :destroy
|
||||
has_many :notifications, as: :activity, dependent: :destroy
|
||||
|
||||
scope :unresolved, -> { where(action_taken_at: nil) }
|
||||
scope :resolved, -> { where.not(action_taken_at: nil) }
|
||||
|
|
Loading…
Reference in a new issue