gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'parent/main' into upstream-20241107

Browse source
This commit is contained in:
KMY 2024-11-07 08:33:20 +09:00
commit a003c2db89
98 changed files with 2002 additions and 590 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/serializers/rest/notification_group_serializer.rb
View file

@ -14,6 +14,7 @@ class REST::NotificationGroupSerializer < ActiveModel::Serializer
belongs_to :account_relationship_severance_event, key: :event, if: :relationship_severance_event?, serializer: REST::AccountRelationshipSeveranceEventSerializer
belongs_to :account_warning, key: :moderation_warning, if: :moderation_warning_event?, serializer: REST::AccountWarningSerializer
has_one :list, if: :list_status_type?, serializer: REST::ListSerializer
belongs_to :generated_annual_report, key: :annual_report, if: :annual_report_event?, serializer: REST::AnnualReportEventSerializer
def sample_account_ids
object.sample_accounts.pluck(:id).map(&:to_s)
@ -47,6 +48,10 @@ class REST::NotificationGroupSerializer < ActiveModel::Serializer
object.type == :moderation_warning
end
def annual_report_event?
object.type == :annual_report
end
def page_min_id
object.pagination_data[:min_id].to_s
end