tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent selection of unacceptable Content-Type files (#2910)

Browse Source 
* Prevent selection of unacceptable Content-Type files

* replace hard code

* media_attachments accept content-types in initial state
This commit is contained in:
Yamagishi Kazutoshi
2017-05-08 23:49:53 +09:00
committed by Eugen Rochko
parent 7140def5c9
commit 459bbfa4b2
5 changed files with 46 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/settings/profiles/show.html.haml
View File

@ -7,8 +7,8 @@
.fields-group
= f.input :display_name, placeholder: t('simple_form.labels.defaults.display_name'), hint: t('simple_form.hints.defaults.display_name', counter: "<span class=\"name-counter\">#{30 - @account.display_name.size}</span>").html_safe
= f.input :note, placeholder: t('simple_form.labels.defaults.note'), hint: t('simple_form.hints.defaults.note', counter: "<span class=\"note-counter\">#{160 - @account.note.size}</span>").html_safe
= f.input :avatar, wrapper: :with_label, hint: t('simple_form.hints.defaults.avatar')
= f.input :header, wrapper: :with_label, hint: t('simple_form.hints.defaults.header')
= f.input :avatar, wrapper: :with_label, input_html: { accept: AccountAvatar::IMAGE_MIME_TYPES.join(',') }, hint: t('simple_form.hints.defaults.avatar')
= f.input :header, wrapper: :with_label, input_html: { accept: AccountHeader::IMAGE_MIME_TYPES.join(',') }, hint: t('simple_form.hints.defaults.header')
= f.input :locked, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.locked')