0
@@ -3,14 +3,15 @@ require 'action_view/helpers/tag_helper'
0
- # The Date Helper primarily creates select/option tags for different kinds of dates and date elements. All of the select-type methods
0
- # share a number of common options that are as follows:
0
+ # The Date Helper primarily creates select/option tags for different kinds of dates and date elements. All of the
0
+ # select-type methods share a number of common options that are as follows:
0
- # * <tt>:prefix</tt> - overwrites the default prefix of "date" used for the select names. So specifying "birthday" would give
0
- # birthday[month] instead of date[month] if passed to the select_month method.
0
+ # * <tt>:prefix</tt> - overwrites the default prefix of "date" used for the select names. So specifying "birthday"
0
+ # would give birthday[month] instead of date[month] if passed to the select_month method.
0
# * <tt>:include_blank</tt> - set to true if it should be possible to set an empty date.
0
- # * <tt>:discard_type</tt> - set to true if you want to discard the type part of the select name. If set to true, the select_month
0
- # method would use simply "date" (which can be overwritten using <tt>:prefix</tt>) instead of "date[month]".
0
+ # * <tt>:discard_type</tt> - set to true if you want to discard the type part of the select name. If set to true,
0
+ # the select_month method would use simply "date" (which can be overwritten using <tt>:prefix</tt>) instead of
0
include ActionView::Helpers::TagHelper
0
DEFAULT_PREFIX = 'date' unless const_defined?('DEFAULT_PREFIX')
0
@@ -67,7 +68,7 @@ module ActionView
0
I18n.with_options :locale => options[:locale], :scope => :'datetime.distance_in_words' do |locale|
0
case distance_in_minutes
0
- return distance_in_minutes == 0 ?
0
+ return distance_in_minutes == 0 ?
0
locale.t(:less_than_x_minutes, :count => 1) :
0
locale.t(:x_minutes, :count => distance_in_minutes) unless include_seconds
0
@@ -91,7 +92,7 @@ module ActionView
0
else locale.t :over_x_years, :count => (distance_in_minutes / 525600).round
0
# Like distance_of_time_in_words, but where <tt>to_time</tt> is fixed to <tt>Time.now</tt>.
0
@@ -107,15 +108,18 @@ module ActionView
0
alias_method :distance_of_time_in_words_to_now, :time_ago_in_words
0
- # Returns a set of select tags (one for year, month, and day) pre-selected for accessing a specified date-based attribute (identified by
0
- # +method+) on an object assigned to the template (identified by +object+). It's possible to tailor the selects through the +options+ hash,
0
- # which accepts all the keys that each of the individual select builders do (like <tt>:use_month_numbers</tt> for select_month) as well as a range of
0
- # discard options. The discard options are <tt>:discard_year</tt>, <tt>:discard_month</tt> and <tt>:discard_day</tt>. Set to true, they'll
0
- # drop the respective select. Discarding the month select will also automatically discard the day select. It's also possible to explicitly
0
- # set the order of the tags using the <tt>:order</tt> option with an array of symbols <tt>:year</tt>, <tt>:month</tt> and <tt>:day</tt> in
0
- # the desired order. Symbols may be omitted and the respective select is not included.
0
+ # Returns a set of select tags (one for year, month, and day) pre-selected for accessing a specified date-based
0
+ # attribute (identified by +method+) on an object assigned to the template (identified by +object+). It's
0
+ # possible to tailor the selects through the +options+ hash, which accepts all the keys that each of the
0
+ # individual select builders do (like <tt>:use_month_numbers</tt> for select_month) as well as a range of discard
0
+ # options. The discard options are <tt>:discard_year</tt>, <tt>:discard_month</tt> and <tt>:discard_day</tt>. Set
0
+ # to true, they'll drop the respective select. Discarding the month select will also automatically discard the
0
+ # day select. It's also possible to explicitly set the order of the tags using the <tt>:order</tt> option with an
0
+ # array of symbols <tt>:year</tt>, <tt>:month</tt> and <tt>:day</tt> in the desired order. Symbols may be omitted
0
+ # and the respective select is not included.
0
- # Pass the <tt>:default</tt> option to set the default date. Use a Time object or a Hash of <tt>:year</tt>, <tt>:month</tt>, <tt>:day</tt>, <tt>:hour</tt>, <tt>:minute</tt>, and <tt>:second</tt>.
0
+ # Pass the <tt>:default</tt> option to set the default date. Use a Time object or a Hash of <tt>:year</tt>,
0
+ # <tt>:month</tt>, <tt>:day</tt>, <tt>:hour</tt>, <tt>:minute</tt>, and <tt>:second</tt>.
0
# Passing <tt>:disabled => true</tt> as part of the +options+ will make elements inaccessible for change.
0
@@ -133,7 +137,7 @@ module ActionView
0
# # Generates a date select that when POSTed is stored in the post variable, in the written_on attribute,
0
# # with the year in the year drop down box starting at 1995, numbers used for months instead of words,
0
- # # and without a day select box.
0
+ # # and without a day select box.
0
# date_select("post", "written_on", :start_year => 1995, :use_month_numbers => true,
0
# :discard_day => true, :include_blank => true)
0
@@ -155,8 +159,8 @@ module ActionView
0
# The selects are prepared for multi-parameter assignment to an Active Record object.
0
- # Note: If the day is not included as an option but the month is, the day will be set to the 1st to ensure that all month
0
+ # Note: If the day is not included as an option but the month is, the day will be set to the 1st to ensure that
0
+ # all month choices are valid.
0
def date_select(object_name, method, options = {}, html_options = {})
0
InstanceTag.new(object_name, method, self, options.delete(:object)).to_date_select_tag(options, html_options)
0
@@ -180,12 +184,12 @@ module ActionView
0
# # Creates a time select tag that, when POSTed, will be stored in the mail variable in the sent_at attribute
0
# time_select("mail", "sent_at")
0
- # # Creates a time select tag with a seconds field that, when POSTed, will be stored in the post variables in
0
- # # the sunrise attribute.
0
+ # # Creates a time select tag with a seconds field that, when POSTed, will be stored in the post variables in
0
+ # # the sunrise attribute.
0
# time_select("post", "start_time", :include_seconds => true)
0
- # # Creates a time select tag with a seconds field that, when POSTed, will be stored in the entry variables in
0
- # # the submission_time attribute.
0
+ # # Creates a time select tag with a seconds field that, when POSTed, will be stored in the entry variables in
0
+ # # the submission_time attribute.
0
# time_select("entry", "submission_time", :include_seconds => true)
0
# # You can set the :minute_step to 15 which will give you: 00, 15, 30 and 45.
0
@@ -193,14 +197,15 @@ module ActionView
0
# The selects are prepared for multi-parameter assignment to an Active Record object.
0
- # Note: If the day is not included as an option but the month is, the day will be set to the 1st to ensure that all month
0
+ # Note: If the day is not included as an option but the month is, the day will be set to the 1st to ensure that
0
+ # all month choices are valid.
0
def time_select(object_name, method, options = {}, html_options = {})
0
InstanceTag.new(object_name, method, self, options.delete(:object)).to_time_select_tag(options, html_options)
0
- # Returns a set of select tags (one for year, month, day, hour, and minute) pre-selected for accessing a specified datetime-based
0
- # attribute (identified by +method+) on an object assigned to the template (identified by +object+). Examples:
0
+ # Returns a set of select tags (one for year, month, day, hour, and minute) pre-selected for accessing a
0
+ # specified datetime-based attribute (identified by +method+) on an object assigned to the template (identified
0
+ # by +object+). Examples:
0
# If anything is passed in the html_options hash it will be applied to every select tag in the set.
0
@@ -208,16 +213,16 @@ module ActionView
0
# # Generates a datetime select that, when POSTed, will be stored in the post variable in the written_on attribute
0
# datetime_select("post", "written_on")
0
- # # Generates a datetime select with a year select that starts at 1995 that, when POSTed, will be stored in the
0
+ # # Generates a datetime select with a year select that starts at 1995 that, when POSTed, will be stored in the
0
# # post variable in the written_on attribute.
0
# datetime_select("post", "written_on", :start_year => 1995)
0
- # # Generates a datetime select with a default value of 3 days from the current time that, when POSTed, will be stored in the
0
- # # trip variable in the departing attribute.
0
+ # # Generates a datetime select with a default value of 3 days from the current time that, when POSTed, will
0
+ # # be stored in the trip variable in the departing attribute.
0
# datetime_select("trip", "departing", :default => 3.days.from_now)
0
- # # Generates a datetime select that discards the type that, when POSTed, will be stored in the post variable as the written_on
0
+ # # Generates a datetime select that discards the type that, when POSTed, will be stored in the post variable
0
+ # # as the written_on attribute.
0
# datetime_select("post", "written_on", :discard_type => true)
0
# The selects are prepared for multi-parameter assignment to an Active Record object.
0
@@ -227,9 +232,10 @@ module ActionView
0
# Returns a set of html select-tags (one for year, month, day, hour, and minute) pre-selected with the +datetime+.
0
# It's also possible to explicitly set the order of the tags using the <tt>:order</tt> option with an array of
0
- # symbols <tt>:year</tt>, <tt>:month</tt> and <tt>:day</tt> in the desired order. If you do not supply a Symbol, it
0
- # will be appended onto the <tt>:order</tt> passed in. You can also add <tt>:date_separator</tt> and <tt>:time_separator</tt>
0
- # keys to the +options+ to control visual display of the elements.
0
+ # symbols <tt>:year</tt>, <tt>:month</tt> and <tt>:day</tt> in the desired order. If you do not supply a Symbol,
0
+ # it will be appended onto the <tt>:order</tt> passed in. You can also add <tt>:date_separator</tt>,
0
+ # <tt>:datetime_separator</tt> and <tt>:time_separator</tt> keys to the +options+ to control visual display of
0
# If anything is passed in the html_options hash it will be applied to every select tag in the set.
0
@@ -250,7 +256,12 @@ module ActionView
0
# # with a '/' between each date field.
0
# select_datetime(my_date_time, :date_separator => '/')
0
- # # Generates a datetime select that discards the type of the field and defaults to the datetime in
0
+ # # Generates a datetime select that defaults to the datetime in my_date_time (four days after today)
0
+ # # with a date fields separated by '/', time fields separated by '' and the date and time fields
0
+ # # separated by a comma (',').
0
+ # select_datetime(my_date_time, :date_separator => '/', :time_separator => '', :datetime_separator => ',')
0
+ # # Generates a datetime select that discards the type of the field and defaults to the datetime in
0
# # my_date_time (four days after today)
0
# select_datetime(my_date_time, :discard_type => true)
0
@@ -261,7 +272,7 @@ module ActionView
0
def select_datetime(datetime = Time.current, options = {}, html_options = {})
0
separator = options[:datetime_separator] || ''
0
select_date(datetime, options, html_options) + separator + select_time(datetime, options, html_options)
0
# Returns a set of html select-tags (one for year, month, and day) pre-selected with the +date+.
0
# It's possible to explicitly set the order of the tags using the <tt>:order</tt> option with an array of
0
@@ -283,27 +294,29 @@ module ActionView
0
# # with the fields ordered year, month, day rather than month, day, year.
0
# select_date(my_date, :order => [:year, :month, :day])
0
- # # Generates a date select that discards the type of the field and defaults to the date in
0
+ # # Generates a date select that discards the type of the field and defaults to the date in
0
# # my_date (six days after today)
0
# select_date(my_date, :discard_type => true)
0
+ # # Generates a date select that defaults to the date in my_date,
0
+ # # which has fields separated by '/'
0
+ # select_date(my_date, :date_separator => '/')
0
# # Generates a date select that defaults to the datetime in my_date (six days after today)
0
# # prefixed with 'payday' rather than 'date'
0
# select_date(my_date, :prefix => 'payday')
0
def select_date(date = Date.current, options = {}, html_options = {})
0
- options
[:order] ||= []0
+ options
.reverse_merge!(:order => [], :date_separator => '')0
[:year, :month, :day].each { |o| options[:order].push(o) unless options[:order].include?(o) }
0
- options[:order].each do |o|
0
- select_date << self.send("select_#{o}", date, options, html_options)
0
+ options[:order].inject([]) { |s, o|
0
+ s << self.send("select_#{o}", date, options, html_options)
0
+ }.join(options[:date_separator])
0
# Returns a set of html select-tags (one for hour and minute)
0
- # You can set <tt>:time_separator</tt> key to format the output, and
0
+ # You can set <tt>:time_separator</tt> key to format the output, and
0
# the <tt>:include_seconds</tt> option to include an input for seconds.
0
# If anything is passed in the html_options hash it will be applied to every select tag in the set.
0
@@ -318,7 +331,7 @@ module ActionView
0
# # Generates a time select that defaults to the time in my_time,
0
- # # which has fields separated by ':'
0
+ # # which has fields separated by ':'
0
# select_time(my_time, :time_separator => ':')
0
# # Generates a time select that defaults to the time in my_time,
0
@@ -331,7 +344,8 @@ module ActionView
0
def select_time(datetime = Time.current, options = {}, html_options = {})
0
separator = options[:time_separator] || ''
0
- select_hour(datetime, options, html_options) + separator + select_minute(datetime, options, html_options) + (options[:include_seconds] ? separator + select_second(datetime, options, html_options) : '')
0
+ select_hour(datetime, options, html_options) + separator + select_minute(datetime, options, html_options) +
0
+ (options[:include_seconds] ? separator + select_second(datetime, options, html_options) : '')
0
# Returns a select tag with options for each of the seconds 0 through 59 with the current second selected.
0
@@ -346,26 +360,16 @@ module ActionView
0
# # Generates a select field for seconds that defaults to the number given
0
# # Generates a select field for seconds that defaults to the seconds for the time in my_time
0
# # that is named 'interval' rather than 'second'
0
# select_second(my_time, :field_name => 'interval')
0
def select_second(datetime, options = {}, html_options = {})
0
val = datetime ? (datetime.kind_of?(Fixnum) ? datetime : datetime.sec) : ''
0
- if options[:use_hidden]
0
- options[:include_seconds] ? hidden_html(options[:field_name] || 'second', val, options) : ''
0
- 0.upto(59) do |second|
0
- second_options << ((val == second) ?
0
- content_tag(:option, leading_zero_on_single_digits(second), :value => leading_zero_on_single_digits(second), :selected => "selected") :
0
- content_tag(:option, leading_zero_on_single_digits(second), :value => leading_zero_on_single_digits(second))
0
- second_options << "\n"
0
- select_html(options[:field_name] || 'second', second_options.join, options, html_options)
0
+ options[:use_hidden] ?
0
+ (options[:include_seconds] ? _date_hidden_html(options[:field_name] || 'second', val, options) : '') :
0
+ _date_select_html(options[:field_name] || 'second', _date_build_options(val), options, html_options)
0
# Returns a select tag with options for each of the minutes 0 through 59 with the current minute selected.
0
@@ -381,26 +385,17 @@ module ActionView
0
# # Generates a select field for minutes that defaults to the number given
0
# # Generates a select field for minutes that defaults to the minutes for the time in my_time
0
# # that is named 'stride' rather than 'second'
0
# select_minute(my_time, :field_name => 'stride')
0
def select_minute(datetime, options = {}, html_options = {})
0
val = datetime ? (datetime.kind_of?(Fixnum) ? datetime : datetime.min) : ''
0
- if options[:use_hidden]
0
- hidden_html(options[:field_name] || 'minute', val, options)
0
- 0.step(59, options[:minute_step] || 1) do |minute|
0
- minute_options << ((val == minute) ?
0
- content_tag(:option, leading_zero_on_single_digits(minute), :value => leading_zero_on_single_digits(minute), :selected => "selected") :
0
- content_tag(:option, leading_zero_on_single_digits(minute), :value => leading_zero_on_single_digits(minute))
0
- minute_options << "\n"
0
- select_html(options[:field_name] || 'minute', minute_options.join, options, html_options)
0
+ options[:use_hidden] ?
0
+ _date_hidden_html(options[:field_name] || 'minute', val, options) :
0
+ _date_select_html(options[:field_name] || 'minute',
0
+ _date_build_options(val, :step => options[:minute_step]), options, html_options)
0
# Returns a select tag with options for each of the hours 0 through 23 with the current hour selected.
0
@@ -415,26 +410,15 @@ module ActionView
0
# # Generates a select field for minutes that defaults to the number given
0
# # Generates a select field for minutes that defaults to the minutes for the time in my_time
0
# # that is named 'stride' rather than 'second'
0
# select_minute(my_time, :field_name => 'stride')
0
def select_hour(datetime, options = {}, html_options = {})
0
val = datetime ? (datetime.kind_of?(Fixnum) ? datetime : datetime.hour) : ''
0
- if options[:use_hidden]
0
- hidden_html(options[:field_name] || 'hour', val, options)
0
- hour_options << ((val == hour) ?
0
- content_tag(:option, leading_zero_on_single_digits(hour), :value => leading_zero_on_single_digits(hour), :selected => "selected") :
0
- content_tag(:option, leading_zero_on_single_digits(hour), :value => leading_zero_on_single_digits(hour))
0
- select_html(options[:field_name] || 'hour', hour_options.join, options, html_options)
0
+ options[:use_hidden] ? _date_hidden_html(options[:field_name] || 'hour', val, options) :
0
+ _date_select_html(options[:field_name] || 'hour', _date_build_options(val, :end => 23), options, html_options)
0
# Returns a select tag with options for each of the days 1 through 31 with the current day selected.
0
@@ -449,36 +433,27 @@ module ActionView
0
# # Generates a select field for days that defaults to the number given
0
# # Generates a select field for days that defaults to the day for the date in my_date
0
# # that is named 'due' rather than 'day'
0
# select_day(my_time, :field_name => 'due')
0
def select_day(date, options = {}, html_options = {})
0
val = date ? (date.kind_of?(Fixnum) ? date : date.day) : ''
0
- if options[:use_hidden]
0
- hidden_html(options[:field_name] || 'day', val, options)
0
- day_options << ((val == day) ?
0
- content_tag(:option, day, :value => day, :selected => "selected") :
0
- content_tag(:option, day, :value => day)
0
- select_html(options[:field_name] || 'day', day_options.join, options, html_options)
0
+ options[:use_hidden] ? _date_hidden_html(options[:field_name] || 'day', val, options) :
0
+ _date_select_html(options[:field_name] || 'day',
0
+ _date_build_options(val, :start => 1, :end => 31, :leading_zeros => false),
0
+ options, html_options)
0
- # Returns a select tag with options for each of the months January through December with the current month selected.
0
- # The month names are presented as keys (what's shown to the user) and the month numbers (1-12) are used as values
0
- # (what's submitted to the server). It's also possible to use month numbers for the presentation instead of names --
0
- # set the <tt>:use_month_numbers</tt> key in +options+ to true for this to happen. If you want both numbers and names,
0
- # set the <tt>:add_month_numbers</tt> key in +options+ to true. If you would prefer to show month names as abbreviations,
0
- # set the <tt>:use_short_month</tt> key in +options+ to true. If you want to use your own month names, set the
0
- # <tt>:use_month_names</tt> key in +options+ to an array of 12 month names. Override the field name using the
0
- # <tt>:field_name</tt> option, 'month' by default.
0
+ # Returns a select tag with options for each of the months January through December with the current month
0
+ # selected. The month names are presented as keys (what's shown to the user) and the month numbers (1-12) are
0
+ # used as values (what's submitted to the server). It's also possible to use month numbers for the presentation
0
+ # instead of names -- set the <tt>:use_month_numbers</tt> key in +options+ to true for this to happen. If you
0
+ # want both numbers and names, set the <tt>:add_month_numbers</tt> key in +options+ to true. If you would prefer
0
+ # to show month names as abbreviations, set the <tt>:use_short_month</tt> key in +options+ to true. If you want
0
+ # to use your own month names, set the <tt>:use_month_names</tt> key in +options+ to an array of 12 month names.
0
+ # Override the field name using the <tt>:field_name</tt> option, 'month' by default.
0
# # Generates a select field for months that defaults to the current month that
0
@@ -490,7 +465,7 @@ module ActionView
0
# select_month(Date.today, :field_name => 'start')
0
# # Generates a select field for months that defaults to the current month that
0
- # # will use keys like "1", "3".
0
+ # # will use keys like "1", "3".
0
# select_month(Date.today, :use_month_numbers => true)
0
# # Generates a select field for months that defaults to the current month that
0
@@ -506,11 +481,11 @@ module ActionView
0
# select_month(Date.today, :use_month_names => %w(Januar Februar Marts ...))
0
def select_month(date, options = {}, html_options = {})
0
- locale = options[:locale]
0
+ locale = options[:locale]
0
val = date ? (date.kind_of?(Fixnum) ? date : date.month) : ''
0
if options[:use_hidden]
0
-
hidden_html(options[:field_name] || 'month', val, options)
0
+
_date_hidden_html(options[:field_name] || 'month', val, options)
0
month_names = options[:use_month_names] || begin
0
@@ -534,14 +509,15 @@ module ActionView
0
-
select_html(options[:field_name] || 'month', month_options.join, options, html_options)
0
+
_date_select_html(options[:field_name] || 'month', month_options.join, options, html_options)
0
- # Returns a select tag with options for each of the five years on each side of the current, which is selected. The five year radius
0
- # can be changed using the <tt>:start_year</tt> and <tt>:end_year</tt> keys in the +options+. Both ascending and descending year
0
- # lists are supported by making <tt>:start_year</tt> less than or greater than <tt>:end_year</tt>. The <tt>date</tt> can also be
0
- # substituted for a year given as a number. Override the field name using the <tt>:field_name</tt> option, 'year' by default.
0
+ # Returns a select tag with options for each of the five years on each side of the current, which is selected.
0
+ # The five year radius can be changed using the <tt>:start_year</tt> and <tt>:end_year</tt> keys in the
0
+ # +options+. Both ascending and descending year lists are supported by making <tt>:start_year</tt> less than or
0
+ # greater than <tt>:end_year</tt>. The <tt>date</tt> can also be substituted for a year given as a number.
0
+ # Override the field name using the <tt>:field_name</tt> option, 'year' by default.
0
# # Generates a select field for years that defaults to the current year that
0
@@ -562,38 +538,48 @@ module ActionView
0
def select_year(date, options = {}, html_options = {})
0
middle_year = Date.today.year
0
elsif date.kind_of?(Fixnum)
0
- val
ue = middle_year = date
0
+ val
= middle_year = date
0
- val
ue = middle_year = date.year
0
+ val
= middle_year = date.year
0
if options[:use_hidden]
0
-
hidden_html(options[:field_name] || 'year', value, options)
0
+
_date_hidden_html(options[:field_name] || 'year', val, options)
0
- start_year = options[:start_year] || middle_year - 5
0
- end_year = options[:end_year] || middle_year + 5
0
- step_val = start_year < end_year ? 1 : -1
0
- start_year.step(end_year, step_val) do |year|
0
- year_options << content_tag(:option, year, :value => year, :selected => "selected")
0
- year_options << content_tag(:option, year, :value => year)
0
- select_html(options[:field_name] || 'year', year_options, options, html_options)
0
+ options[:start_year] ||= middle_year - 5
0
+ options[:end_year] ||= middle_year + 5
0
+ step = options[:start_year] < options[:end_year] ? 1 : -1
0
+ _date_select_html(options[:field_name] || 'year',
0
+ _date_build_options(val,
0
+ :start => options[:start_year],
0
+ :end => options[:end_year],
0
+ :leading_zeros => false
0
+ ), options, html_options)
0
+ def _date_build_options(selected, options={})
0
+ options.reverse_merge!(:start => 0, :end => 59, :step => 1, :leading_zeros => true)
0
+ (options[:start] || 0).step((options[:end] || 59), options[:step] || 1) do |i|
0
+ value = options[:leading_zeros] ? sprintf("%02d", i) : i
0
+ tag_options = { :value => value }
0
+ tag_options[:selected] = "selected" if selected == i
0
+ select_options << content_tag(:option, value, tag_options)
0
+ select_options.join("\n") + "\n"
0
- def select_html(type, html_options, options, select_tag_options = {})
0
- name_and_id_from_options(options, type)
0
+ def _date_select_html(type, html_options, options, select_tag_options = {})
0
+ _date_name_and_id_from_options(options, type)
0
select_options = {:id => options[:id], :name => options[:name]}
0
select_options.merge!(:disabled => 'disabled') if options[:disabled]
0
select_options.merge!(select_tag_options) unless select_tag_options.empty?
0
@@ -603,19 +589,15 @@ module ActionView
0
content_tag(:select, select_html, select_options) + "\n"
0
- def hidden_html(type, value, options)
0
- name_and_id_from_options(options, type)
0
+ def _date_hidden_html(type, value, options)
0
+ _date_name_and_id_from_options(options, type)
0
hidden_html = tag(:input, :type => "hidden", :id => options[:id], :name => options[:name], :value => value) + "\n"
0
- def
name_and_id_from_options(options, type)
0
+ def
_date_name_and_id_from_options(options, type)
0
options[:name] = (options[:prefix] || DEFAULT_PREFIX) + (options[:discard_type] ? '' : "[#{type}]")
0
options[:id] = options[:name].gsub(/([\[\(])|(\]\[)/, '_').gsub(/[\]\)]/, '')
0
- def leading_zero_on_single_digits(number)
0
- number > 9 ? number : "0#{number}"
0
class InstanceTag #:nodoc:
0
@@ -641,11 +623,11 @@ module ActionView
0
options = defaults.merge(options)
0
datetime = value(object)
0
datetime ||= default_time_from_options(options[:default]) unless options[:include_blank]
0
position = { :year => 1, :month => 2, :day => 3, :hour => 4, :minute => 5, :second => 6 }
0
order = options[:order] ||= I18n.translate(:'date.order', :locale => locale)
0
# Discard explicit and implicit by not being included in the :order
0
discard[:year] = true if options[:discard_year] or !order.include?(:year)
0
@@ -654,26 +636,30 @@ module ActionView
0
discard[:hour] = true if options[:discard_hour]
0
discard[:minute] = true if options[:discard_minute] or discard[:hour]
0
discard[:second] = true unless options[:include_seconds] && !discard[:minute]
0
# If the day is hidden and the month is visible, the day should be set to the 1st so all month choices are valid
0
# (otherwise it could be 31 and february wouldn't be a valid date)
0
if datetime && discard[:day] && !discard[:month]
0
datetime = datetime.change(:day => 1)
0
# Maintain valid dates by including hidden fields for discarded elements
0
[:day, :month, :year].each { |o| order.unshift(o) unless order.include?(o) }
0
# Ensure proper ordering of :hour, :minute and :second
0
[:hour, :minute, :second].each { |o| order.delete(o); order.push(o) }
0
date_or_time_select = ''
0
order.reverse.each do |param|
0
# Send hidden fields for discarded elements once output has started
0
# This ensures AR can reconstruct valid dates using ParseDate
0
next if discard[param] && (date_or_time_select.empty? || options[:ignore_date])
0
- date_or_time_select.insert(0, self.send("select_#{param}", datetime, options_with_prefix(position[param], options.merge(:use_hidden => discard[param])), html_options))
0
+ date_or_time_select.insert(0,
0
+ self.send("select_#{param}",
0
+ options_with_prefix(position[param], options.merge(:use_hidden => discard[param])),
0
date_or_time_select.insert(0,
0
when :hour then (discard[:year] && discard[:day] ? "" : " — ")
0
@@ -682,7 +668,7 @@ module ActionView
0
@@ -708,7 +694,7 @@ module ActionView
0
default[:sec] ||= default[:second]
0
[:year, :month, :day, :hour, :min, :sec].each do |key|
0
default[key] ||= time.send(key)