aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorPiotr Sarnacki <drogus@gmail.com>2012-03-26 13:10:05 -0700
committerPiotr Sarnacki <drogus@gmail.com>2012-03-26 13:10:05 -0700
commitea0789f08d69beb9ddb2ca64c69c4da8f5bd0222 (patch)
tree1bd9c820967de24cad468fba407356de4533a399 /actionpack/lib
parent9637de6b472b05a09fe6d28d973b4729e3ea4615 (diff)
parent65434a2f259e94ebacccd1166e5d6a93d0b77732 (diff)
downloadrails-ea0789f08d69beb9ddb2ca64c69c4da8f5bd0222.tar.gz
rails-ea0789f08d69beb9ddb2ca64c69c4da8f5bd0222.tar.bz2
rails-ea0789f08d69beb9ddb2ca64c69c4da8f5bd0222.zip
Merge pull request #5594 from lest/patch-1
apply form_for namespace option to date_select
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_view/helpers/date_helper.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb
index 2bfc6371f5..45e5a862b6 100644
--- a/actionpack/lib/action_view/helpers/date_helper.rb
+++ b/actionpack/lib/action_view/helpers/date_helper.rb
@@ -977,7 +977,10 @@ module ActionView
# Returns the id attribute for the input tag.
# => "post_written_on_1i"
def input_id_from_type(type)
- input_name_from_type(type).gsub(/([\[\(])|(\]\[)/, '_').gsub(/[\]\)]/, '')
+ id = input_name_from_type(type).gsub(/([\[\(])|(\]\[)/, '_').gsub(/[\]\)]/, '')
+ id = @options[:namespace] + '_' + id if @options[:namespace]
+
+ id
end
# Given an ordering of datetime components, create the selection HTML