OpenCloud
/
mastodon
mirror of https://github.com/tootsuite/mastodon
1
1
Fork 0
Code Issues Releases Wiki Activity

Fix HTML validation (#10354) 

* Fix HTML validation

* Report first HTML error instead on validation error
pull/10390/head
ThibG 2019-03-26 17:33:26 +01:00 committed by Eugen Rochko
parent 6f6abc369f
commit 0c46bd11aa
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/validators/html_validator.rb
View File

@ -3,12 +3,16 @@
class HtmlValidator < ActiveModel::EachValidator class HtmlValidator < ActiveModel::EachValidator
def validate_each(record, attribute, value) def validate_each(record, attribute, value)
return if value.blank? return if value.blank?
record.errors.add(attribute, I18n.t('html_validator.invalid_markup')) unless valid_html?(value) errors = html_errors(value)
unless errors.empty?
record.errors.add(attribute, I18n.t('html_validator.invalid_markup', error: errors.first.to_s))
end
end end
private private
def valid_html?(str) def html_errors(str)
Nokogiri::HTML.fragment(str).to_s == str fragment = Nokogiri::HTML.fragment(str)
fragment.errors
end end
end end

2
config/locales/en.yml
View File

@ -638,7 +638,7 @@ en:
one: Something isn't quite right yet! Please review the error below one: Something isn't quite right yet! Please review the error below
other: Something isn't quite right yet! Please review %{count} errors below other: Something isn't quite right yet! Please review %{count} errors below
html_validator: html_validator:
invalid_markup: contains invalid HTML markup invalid_markup: 'contains invalid HTML markup: %{error}'
identity_proofs: identity_proofs:
active: Active active: Active
authorize: Yes, authorize authorize: Yes, authorize