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

This commit is contained in:
KMY 2024-05-17 08:53:59 +09:00
commit 094ff9d2ee
153 changed files with 1412 additions and 631 deletions

View file

@ -62,14 +62,16 @@
.report-notes
= render partial: 'admin/report_notes/report_note', collection: @moderation_notes
= simple_form_for @account_moderation_note, url: admin_account_moderation_notes_path do |f|
= f.hidden_field :target_account_id
= simple_form_for @account_moderation_note, url: admin_account_moderation_notes_path do |form|
= form.hidden_field :target_account_id
= render 'shared/error_messages', object: @account_moderation_note
.field-group
= f.input :content, placeholder: t('admin.reports.notes.placeholder'), rows: 6
= form.input :content, input_html: { placeholder: t('admin.reports.notes.placeholder'), maxlength: AccountModerationNote::CONTENT_SIZE_LIMIT, rows: 6, autofocus: @account_moderation_note.errors.any? }
.actions
= f.button :button, t('admin.account_moderation_notes.create'), type: :submit
= form.button :button, t('admin.account_moderation_notes.create'), type: :submit
%hr.spacer/