aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/lib/action_view/helpers/tags/search_field.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-12-09 13:02:35 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-12-09 13:02:35 -0200
commit5c7b5dc741f6980de2592e9b113ae385000a6da7 (patch)
tree06da9eee3c4727c61240d1c82a262258f4825170 /actionview/lib/action_view/helpers/tags/search_field.rb
parent8e52954349c29d5f190f01b21e9087885afd8dab (diff)
parent112274ebffa0cb3e5e15e61a866031d9200c5331 (diff)
downloadrails-5c7b5dc741f6980de2592e9b113ae385000a6da7.tar.gz
rails-5c7b5dc741f6980de2592e9b113ae385000a6da7.tar.bz2
rails-5c7b5dc741f6980de2592e9b113ae385000a6da7.zip
Merge pull request #17975 from merongivian/add_test_for_search_field
Fix options overwritten by super
Diffstat (limited to 'actionview/lib/action_view/helpers/tags/search_field.rb')
-rw-r--r--actionview/lib/action_view/helpers/tags/search_field.rb20
1 files changed, 9 insertions, 11 deletions
diff --git a/actionview/lib/action_view/helpers/tags/search_field.rb b/actionview/lib/action_view/helpers/tags/search_field.rb
index c09e2f1be7..4597cec6fa 100644
--- a/actionview/lib/action_view/helpers/tags/search_field.rb
+++ b/actionview/lib/action_view/helpers/tags/search_field.rb
@@ -3,20 +3,18 @@ module ActionView
module Tags # :nodoc:
class SearchField < TextField # :nodoc:
def render
- options = @options.stringify_keys
-
- if options["autosave"]
- if options["autosave"] == true
- options["autosave"] = request.host.split(".").reverse.join(".")
+ super do |options|
+ if options["autosave"]
+ if options["autosave"] == true
+ options["autosave"] = request.host.split(".").reverse.join(".")
+ end
+ options["results"] ||= 10
end
- options["results"] ||= 10
- end
- if options["onsearch"]
- options["incremental"] = true unless options.has_key?("incremental")
+ if options["onsearch"]
+ options["incremental"] = true unless options.has_key?("incremental")
+ end
end
-
- super
end
end
end