Skip to content
Snippets Groups Projects
Unverified Commit 98a2bb8b authored by Claire's avatar Claire Committed by GitHub
Browse files

Fix issue with severed relationships notifications (#29668)

parent 954b470f
No related branches found
No related tags found
No related merge requests found
...@@ -16,7 +16,7 @@ class AccountRelationshipSeveranceEvent < ApplicationRecord ...@@ -16,7 +16,7 @@ class AccountRelationshipSeveranceEvent < ApplicationRecord
belongs_to :account belongs_to :account
belongs_to :relationship_severance_event belongs_to :relationship_severance_event
delegate :severed_relationships, :type, :target_name, :purged, to: :relationship_severance_event, prefix: false delegate :severed_relationships, :type, :target_name, :purged?, to: :relationship_severance_event, prefix: false
before_create :set_relationships_count! before_create :set_relationships_count!
......
...@@ -89,7 +89,7 @@ class Notification < ApplicationRecord ...@@ -89,7 +89,7 @@ class Notification < ApplicationRecord
belongs_to :favourite, inverse_of: :notification belongs_to :favourite, inverse_of: :notification
belongs_to :poll, inverse_of: false belongs_to :poll, inverse_of: false
belongs_to :report, inverse_of: false belongs_to :report, inverse_of: false
belongs_to :relationship_severance_event, inverse_of: false belongs_to :account_relationship_severance_event, inverse_of: false
end end
validates :type, inclusion: { in: TYPES } validates :type, inclusion: { in: TYPES }
......
...@@ -6,7 +6,7 @@ class REST::NotificationSerializer < ActiveModel::Serializer ...@@ -6,7 +6,7 @@ class REST::NotificationSerializer < ActiveModel::Serializer
belongs_to :from_account, key: :account, serializer: REST::AccountSerializer belongs_to :from_account, key: :account, serializer: REST::AccountSerializer
belongs_to :target_status, key: :status, if: :status_type?, serializer: REST::StatusSerializer belongs_to :target_status, key: :status, if: :status_type?, serializer: REST::StatusSerializer
belongs_to :report, if: :report_type?, serializer: REST::ReportSerializer belongs_to :report, if: :report_type?, serializer: REST::ReportSerializer
belongs_to :relationship_severance_event, key: :event, if: :relationship_severance_event?, serializer: REST::AccountRelationshipSeveranceEventSerializer belongs_to :account_relationship_severance_event, key: :event, if: :relationship_severance_event?, serializer: REST::AccountRelationshipSeveranceEventSerializer
def id def id
object.id.to_s object.id.to_s
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment