treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Use shared `form` partial for `admin/announcements` views (#29608)

main-rebase-security-fix
Matt Jankowski 2024-04-19 09:57:32 -04:00 committed by GitHub
parent e5d5bd7ff1
commit 4837bfcc6a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 38 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/views/admin/announcements/_form.html.haml Normal file
View File

@ -0,0 +1,28 @@
.fields-group
= form.input :starts_at,
html5: true,
include_blank: true,
input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder },
wrapper: :with_block_label
= form.input :ends_at,
html5: true,
include_blank: true,
input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder },
wrapper: :with_block_label
.fields-group
= form.input :all_day,
as: :boolean,
wrapper: :with_label
.fields-group
= form.input :text,
wrapper: :with_block_label
- unless form.object.published?
.fields-group
= form.input :scheduled_at,
html5: true,
include_blank: true,
input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder },
wrapper: :with_block_label

35
app/views/admin/announcements/edit.html.haml
View File

@ -1,37 +1,12 @@
- content_for :page_title do
= t('.title')
= simple_form_for @announcement, url: admin_announcement_path(@announcement), html: { novalidate: false } do |f|
= simple_form_for @announcement, url: admin_announcement_path(@announcement), html: { novalidate: false } do |form|
= render 'shared/error_messages', object: @announcement
.fields-group
= f.input :starts_at,
html5: true,
include_blank: true,
input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder },
wrapper: :with_block_label
= f.input :ends_at,
html5: true,
include_blank: true,
input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder },
wrapper: :with_block_label
.fields-group
= f.input :all_day,
as: :boolean,
wrapper: :with_label
.fields-group
= f.input :text,
wrapper: :with_block_label
- unless @announcement.published?
.fields-group
= f.input :scheduled_at,
html5: true,
include_blank: true,
input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder },
wrapper: :with_block_label
= render form
.actions
= f.button :button, t('generic.save_changes'), type: :submit
= form.button :button,
t('generic.save_changes'),
type: :submit

32
app/views/admin/announcements/new.html.haml
View File

@ -1,38 +1,12 @@
- content_for :page_title do
= t('.title')
= simple_form_for @announcement, url: admin_announcements_path, html: { novalidate: false } do |f|
= simple_form_for @announcement, url: admin_announcements_path, html: { novalidate: false } do |form|
= render 'shared/error_messages', object: @announcement
.fields-group
= f.input :starts_at,
html5: true,
include_blank: true,
input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder },
wrapper: :with_block_label
= f.input :ends_at,
html5: true,
include_blank: true,
input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder },
wrapper: :with_block_label
.fields-group
= f.input :all_day,
as: :boolean,
wrapper: :with_label
.fields-group
= f.input :text,
wrapper: :with_block_label
.fields-group
= f.input :scheduled_at,
html5: true,
include_blank: true,
input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder },
wrapper: :with_block_label
= render form
.actions
= f.button :button,
= form.button :button,
t('.create'),
type: :submit