Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-29 23:23:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'e6b903b21e0682c1156ffec583ac2836fda7d657' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire
2023-10-08 16:30:00 +02:00
parent ebd2017524 e6b903b21e
commit 19ebf7797e
26 changed files with 605 additions and 543 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/views/admin/invites/index.html.haml
View File

@@ -14,7 +14,8 @@
- if policy(:invite).create?
%p= t('invites.prompt')
= render 'invites/form'
= simple_form_for(@invite, url: admin_invites_path) do |form|
= render partial: 'invites/form', object: form
%hr.spacer/

21
app/views/invites/_form.html.haml
View File

@@ -1,14 +1,13 @@
= simple_form_for(@invite, url: controller.is_a?(Admin::InvitesController) ? admin_invites_path : invites_path) do |f|
= render 'shared/error_messages', object: @invite
= render 'shared/error_messages', object: form.object
.fields-row
.fields-row__column.fields-row__column-6.fields-group
= f.input :max_uses, wrapper: :with_label, collection: [1, 5, 10, 25, 50, 100], label_method: ->(num) { I18n.t('invites.max_uses', count: num) }, prompt: I18n.t('invites.max_uses_prompt')
.fields-row__column.fields-row__column-6.fields-group
= f.input :expires_in, wrapper: :with_label, collection: [30.minutes, 1.hour, 6.hours, 12.hours, 1.day, 1.week].map(&:to_i), label_method: ->(i) { I18n.t("invites.expires_in.#{i}") }, prompt: I18n.t('invites.expires_in_prompt')
.fields-row
.fields-row__column.fields-row__column-6.fields-group
= form.input :max_uses, wrapper: :with_label, collection: invites_max_uses_options, label_method: ->(num) { I18n.t('invites.max_uses', count: num) }, prompt: I18n.t('invites.max_uses_prompt')
.fields-row__column.fields-row__column-6.fields-group
= form.input :expires_in, wrapper: :with_label, collection: invites_expires_options.map(&:to_i), label_method: ->(i) { I18n.t("invites.expires_in.#{i}") }, prompt: I18n.t('invites.expires_in_prompt')
.fields-group
= f.input :autofollow, wrapper: :with_label
.fields-group
= form.input :autofollow, wrapper: :with_label
.actions
= f.button :button, t('invites.generate'), type: :submit
.actions
= form.button :button, t('invites.generate'), type: :submit

3
app/views/invites/index.html.haml
View File

@@ -4,7 +4,8 @@
- if policy(:invite).create?
%p= t('invites.prompt')
= render 'form'
= simple_form_for(@invite, url: invites_path) do |form|
= render partial: 'form', object: form
%hr.spacer/