kotovalexarian-likes-github/heartcombo--simple_form
1
0
Fork 0
mirror of https://github.com/heartcombo/simple_form.git synced 2022-11-09 12:19:26 -05:00
Code Releases Activity

Merge pull request #1183 from ericsullivan/fix_html5_date_label

Browse source 
fix label on dates if HTML5 compatibility is explicitly enbled
This commit is contained in:
Carlos Antonio da Silva 2014-12-26 16:34:38 -02:00
commit 4c633a1b7c
2 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/simple_form/inputs/date_time_input.rb
View file

@ -14,16 +14,20 @@ module SimpleForm
private
def label_target
position = case input_type
when :date, :datetime
date_order = input_options[:order] || I18n.t('date.order')
date_order.first.to_sym
if use_html5_inputs?
attribute_name
else
:hour
end
position = case input_type
when :date, :datetime
date_order = input_options[:order] || I18n.t('date.order')
date_order.first.to_sym
else
:hour
end
position = ActionView::Helpers::DateTimeSelector::POSITION[position]
"#{attribute_name}_#{position}i"
position = ActionView::Helpers::DateTimeSelector::POSITION[position]
"#{attribute_name}_#{position}i"
end
end
def use_html5_inputs?

5
test/inputs/datetime_input_test.rb
View file

@ -169,4 +169,9 @@ class DateTimeInputWithoutHtml5Test < ActionView::TestCase
with_input_for :project, :created_at, :time, html5: false
assert_select 'label[for=project_created_at_4i]'
end
test 'label points to attribute_name if HTML5 compatibility is explicitly enbled' do
with_input_for :project, :created_at, :date, html5: true
assert_select 'label[for=project_created_at]'
end
end