def index
authorize :account_warning_preset, :index?
- @warning_presets = AccountWarningPreset.all
+ @warning_presets = AccountWarningPreset.alphabetic
@warning_preset = AccountWarningPreset.new
end
if @warning_preset.save
redirect_to admin_warning_presets_path
else
- @warning_presets = AccountWarningPreset.all
+ @warning_presets = AccountWarningPreset.alphabetic
render :index
end
end
end
def warning_preset_params
- params.require(:account_warning_preset).permit(:text)
+ params.require(:account_warning_preset).permit(:title, :text)
end
end
end
# text :text default(""), not null
# created_at :datetime not null
# updated_at :datetime not null
+# title :string default(""), not null
#
class AccountWarningPreset < ApplicationRecord
validates :text, presence: true
+
+ scope :alphabetic, -> { order(title: :asc, text: :asc) }
end
- unless @warning_presets.empty?
.fields-group
- = f.input :warning_preset_id, collection: @warning_presets, label_method: :text, wrapper: :with_block_label
+ = f.input :warning_preset_id, collection: @warning_presets, label_method: ->(warning_preset) { [warning_preset.title.presence, truncate(warning_preset.text)].compact.join(' - ') }, wrapper: :with_block_label
.fields-group
= f.input :text, as: :text, wrapper: :with_block_label, hint: t('simple_form.hints.admin_account_action.text_html', path: admin_warning_presets_path)
--- /dev/null
+.announcements-list__item
+ = link_to edit_admin_warning_preset_path(warning_preset), class: 'announcements-list__item__title' do
+ = warning_preset.title.presence || truncate(warning_preset.text)
+
+ .announcements-list__item__action-bar
+ .announcements-list__item__meta
+ = truncate(warning_preset.text)
+
+ %div
+ = table_link_to 'trash', t('admin.warning_presets.delete'), admin_warning_preset_path(warning_preset), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') } if can?(:destroy, warning_preset)
= simple_form_for @warning_preset, url: admin_warning_preset_path(@warning_preset) do |f|
= render 'shared/error_messages', object: @warning_preset
+ .fields-group
+ = f.input :title, wrapper: :with_block_label
+
.fields-group
= f.input :text, wrapper: :with_block_label
= simple_form_for @warning_preset, url: admin_warning_presets_path do |f|
= render 'shared/error_messages', object: @warning_preset
+ .fields-group
+ = f.input :title, wrapper: :with_block_label
+
.fields-group
= f.input :text, wrapper: :with_block_label
%hr.spacer/
-- unless @warning_presets.empty?
- .table-wrapper
- %table.table
- %thead
- %tr
- %th= t('simple_form.labels.account_warning_preset.text')
- %th
- %tbody
- - @warning_presets.each do |preset|
- %tr
- %td
- = Formatter.instance.linkify(preset.text)
- %td
- = table_link_to 'pencil', t('admin.warning_presets.edit'), edit_admin_warning_preset_path(preset)
- = table_link_to 'trash', t('admin.warning_presets.delete'), admin_warning_preset_path(preset), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') }
+- if @warning_presets.empty?
+ %div.muted-hint.center-text
+ = t 'admin.warning_presets.empty'
+- else
+ .announcements-list
+ = render partial: 'warning_preset', collection: @warning_presets
warning_presets:
add_new: إضافة واحد جديد
delete: حذف
- edit: تعديل
edit_preset: تعديل نموذج التحذير
title: إدارة نماذج التحذير
admin_mailer:
warning_presets:
add_new: Afegeix-ne un de nou
delete: Esborra
- edit: Edita
edit_preset: Edita l'avís predeterminat
title: Gestiona les configuracions predefinides dels avisos
admin_mailer:
warning_presets:
add_new: Aghjunghje
delete: Sguassà
- edit: Cambià
edit_preset: Cambià a preselezzione d'avertimentu
title: Amministrà e preselezzione d'avertimentu
admin_mailer:
warning_presets:
add_new: Přidat nové
delete: Smazat
- edit: Upravit
edit_preset: Upravit předlohu pro varování
title: Spravovat předlohy pro varování
admin_mailer:
warning_presets:
add_new: Ychwanegu newydd
delete: Dileu
- edit: Golygu
edit_preset: Golygu rhagosodiad rhybudd
title: Rheoli rhagosodiadau rhybudd
admin_mailer:
most_recent: Seneste
warning_presets:
delete: Slet
- edit: Rediger
admin_mailer:
new_report:
body: "%{reporter} har anmeldt %{target}"
warning_presets:
add_new: Neu hinzufügen
delete: Löschen
- edit: Bearbeiten
edit_preset: Warnungsvorlage bearbeiten
title: Warnungsvorlagen verwalten
admin_mailer:
warning_presets:
add_new: Πρόσθεση νέου
delete: Διαγραφή
- edit: Ενημέρωση
edit_preset: Ενημέρωση προκαθορισμένης προειδοποίησης
title: Διαχείριση προκαθορισμένων προειδοποιήσεων
admin_mailer:
warning_presets:
add_new: Add new
delete: Delete
- edit: Edit
edit_preset: Edit warning preset
title: Manage warning presets
admin_mailer:
warning_presets:
add_new: Add new
delete: Delete
- edit: Edit
edit_preset: Edit warning preset
title: Manage warning presets
admin_mailer:
warning_presets:
add_new: Aldoni novan
delete: Forigi
- edit: Redakti
edit_preset: Redakti avertan antaŭagordon
title: Administri avertajn antaŭagordojn
admin_mailer:
warning_presets:
add_new: Agregar nuevo
delete: Eliminar
- edit: Editar
edit_preset: Editar preajuste de advertencia
title: Administrar preajustes de advertencia
admin_mailer:
warning_presets:
add_new: Añadir nuevo
delete: Borrar
- edit: Editar
edit_preset: Editar aviso predeterminado
title: Editar configuración predeterminada de avisos
admin_mailer:
warning_presets:
add_new: Lisa uus
delete: Kustuta
- edit: Redigeeri
edit_preset: Redigeeri hoiatuse eelseadistust
title: Halda hoiatuste eelseadistusi
admin_mailer:
warning_presets:
add_new: Gehitu berria
delete: Ezabatu
- edit: Editatu
edit_preset: Editatu abisu aurre-ezarpena
title: Kudeatu abisu aurre-ezarpenak
admin_mailer:
warning_presets:
add_new: افزودن تازه
delete: زدودن
- edit: ویرایش
edit_preset: ویرایش هشدار پیشفرض
title: مدیریت هشدارهای پیشفرض
admin_mailer:
warning_presets:
add_new: Ajouter un nouveau
delete: Effacer
- edit: Éditer
edit_preset: Éditer les avertissements prédéfinis
title: Gérer les avertissements prédéfinis
admin_mailer:
warning_presets:
add_new: Engadir novo
delete: Eliminar
- edit: Editar
edit_preset: Editar aviso preestablecido
title: Xestionar avisos preestablecidos
admin_mailer:
warning_presets:
add_new: Új hozzáadása
delete: Törlés
- edit: Szerkesztés
edit_preset: Figyelmeztetés szerkesztése
title: Figyelmeztetések
admin_mailer:
warning_presets:
add_new: Tambah baru
delete: Hapus
- edit: Sunting
edit_preset: Sunting preset peringatan
title: Kelola preset peringatan
admin_mailer:
warning_presets:
add_new: Bæta við nýju
delete: Eyða
- edit: Breyta
edit_preset: Breyta forstilltri aðvörun
title: Sýsla með forstilltar aðvaranir
admin_mailer:
warning_presets:
add_new: Aggiungi nuovo
delete: Cancella
- edit: Modifica
edit_preset: Modifica avviso predefinito
title: Gestisci avvisi predefiniti
admin_mailer:
warning_presets:
add_new: 追加
delete: 削除
- edit: 編集
edit_preset: プリセット警告文を編集
title: プリセット警告文を管理
admin_mailer:
warning_presets:
add_new: Rnu amaynut
delete: Kkes
- edit: Ẓreg
admin_mailer:
new_report:
subject: Aneqqis amaynut i %{instance} (#%{id})
warning_presets:
add_new: Add nеw
delete: Deletе
- edit: Еdit
edit_preset: Edit warning prеset
title: Manage warning presеts
admin_mailer:
warning_presets:
add_new: 새로 추가
delete: 삭제
- edit: 편집
edit_preset: 경고 틀 수정
title: 경고 틀 관리
admin_mailer:
warning_presets:
add_new: Pridėti naują
delete: Ištrinti
- edit: Keisti
edit_preset: Keisti įspėjimo nustatymus
title: Valdyti įspėjimo nustatymus
admin_mailer:
warning_presets:
add_new: Nieuwe toevoegen
delete: Verwijderen
- edit: Bewerken
edit_preset: Voorinstelling van waarschuwing bewerken
title: Voorinstellingen van waarschuwingen beheren
admin_mailer:
warning_presets:
add_new: Legg til ny
delete: Slett
- edit: Rediger
edit_preset: Endr åtvaringsoppsett
title: Handsam åtvaringsoppsett
admin_mailer:
warning_presets:
add_new: Legg til ny
delete: Slett
- edit: Rediger
admin_mailer:
new_pending_account:
body: Detaljer om den nye kontoen er nedenfor. Du kan godkjenne eller avvise denne søknaden.
warning_presets:
add_new: N’ajustar un nòu
delete: Escafar
- edit: Modificar
edit_preset: Modificar lo tèxt predefinit d’avertiment
title: Gerir los tèxtes predefinits
admin_mailer:
warning_presets:
add_new: Dodaj nowy
delete: Usuń
- edit: Edytuj
edit_preset: Edytuj szablon ostrzeżenia
title: Zarządzaj szablonami ostrzeżeń
admin_mailer:
warning_presets:
add_new: Adicionar novo
delete: Excluir
- edit: Editar
edit_preset: Editar o aviso pré-definido
title: Gerenciar os avisos pré-definidos
admin_mailer:
warning_presets:
add_new: Adicionar novo
delete: Apagar
- edit: Editar
edit_preset: Editar o aviso predefinido
title: Gerir os avisos predefinidos
admin_mailer:
warning_presets:
add_new: Добавить
delete: Удалить
- edit: Изменить
edit_preset: Удалить шаблон предупреждения
title: Управление шаблонами предупреждений
admin_mailer:
acct: Specify the username@domain of the account you want to move to
account_warning_preset:
text: You can use toot syntax, such as URLs, hashtags and mentions
+ title: Optional. Not visible to the recipient
admin_account_action:
include_statuses: The user will see which toots have caused the moderation action or warning
send_email_notification: The user will receive an explanation of what happened with their account
acct: Handle of the new account
account_warning_preset:
text: Preset text
+ title: Title
admin_account_action:
include_statuses: Include reported toots in the e-mail
send_email_notification: Notify the user per e-mail
warning_presets:
add_new: Pridaj nové
delete: Vymaž
- edit: Uprav
edit_preset: Uprav varovnú predlohu
title: Spravuj varovné predlohy
admin_mailer:
warning_presets:
add_new: Dodaj novo
delete: Izbriši
- edit: Uredi
edit_preset: Uredi prednastavitev opozoril
title: Upravljaj prednastavitev opozoril
admin_mailer:
warning_presets:
add_new: Shtoni të ri
delete: Fshije
- edit: Përpunoni
edit_preset: Përpunoni sinjalizim të paracaktuar
title: Administroni sinjalizime të paracaktuara
admin_mailer:
warning_presets:
add_new: Додај нови
delete: Избриши
- edit: Уреди
edit_preset: Уреди пресет упозорења
title: Управљај пресетима упозорења
admin_mailer:
warning_presets:
add_new: Lägg till ny
delete: Radera
- edit: Redigera
admin_mailer:
new_report:
body: "%{reporter} har rapporterat %{target}"
warning_presets:
add_new: เพิ่มใหม่
delete: ลบ
- edit: แก้ไข
edit_preset: แก้ไขคำเตือนที่ตั้งไว้ล่วงหน้า
title: จัดการคำเตือนที่ตั้งไว้ล่วงหน้า
admin_mailer:
warning_presets:
add_new: Yeni ekle
delete: Sil
- edit: Düzenle
edit_preset: Uyarı ön-ayarını düzenle
title: Uyarı ön-ayarlarını yönet
admin_mailer:
warning_presets:
add_new: Додати новий
delete: Видалити
- edit: Редагувати
edit_preset: Редагувати шаблон попередження
title: Управління шаблонами попереджень
admin_mailer:
warning_presets:
add_new: Thêm mới
delete: Xóa bỏ
- edit: Biên tập
edit_preset: Chỉnh sửa cảnh báo đặt trước
title: Quản lý cài đặt trước cảnh báo
admin_mailer:
warning_presets:
add_new: 添加新条目
delete: 删除
- edit: 编辑
edit_preset: 编辑预置警告
title: 管理预设警告
admin_mailer:
warning_presets:
add_new: 新增
delete: 刪除
- edit: 編輯
admin_mailer:
new_report:
body: "%{reporter} 舉報了用戶 %{target}"
warning_presets:
add_new: 新增
delete: 刪除
- edit: 編輯
admin_mailer:
new_report:
body: "%{reporter} 檢舉了使用者 %{target}"
--- /dev/null
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class AddTitleToAccountWarningPresets < ActiveRecord::Migration[5.2]
+ include Mastodon::MigrationHelpers
+
+ disable_ddl_transaction!
+
+ def up
+ safety_assured { add_column_with_default :account_warning_presets, :title, :string, default: '', allow_null: false }
+ end
+
+ def down
+ remove_column :account_warning_presets, :title
+ end
+end
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 2020_03_06_035625) do
+ActiveRecord::Schema.define(version: 2020_03_12_144258) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
t.text "text", default: "", null: false
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
+ t.string "title", default: "", null: false
end
create_table "account_warnings", force: :cascade do |t|
cat aescling's git repositories / mastodon.git / commitdiff