diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-09-01 23:51:23 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-09-01 23:51:23 +0530 |
| commit | a6674991037fc360c7a72e7c28eec448f0231a3e (patch) | |
| tree | f31b246cf779b8a09b4bc1d0db132c0e712d732b /actionpack | |
| parent | 7f800b4d69c0750bb47989027580299751a22616 (diff) | |
| parent | 831b814a8778aad0d038aab550b7d405d4a69d37 (diff) | |
| download | rails-a6674991037fc360c7a72e7c28eec448f0231a3e.tar.gz rails-a6674991037fc360c7a72e7c28eec448f0231a3e.tar.bz2 rails-a6674991037fc360c7a72e7c28eec448f0231a3e.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_dispatch/request/session.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_view/helpers/form_tag_helper.rb | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/request/session.rb b/actionpack/lib/action_dispatch/request/session.rb index d8bcc28613..35d694b4a1 100644 --- a/actionpack/lib/action_dispatch/request/session.rb +++ b/actionpack/lib/action_dispatch/request/session.rb @@ -2,7 +2,7 @@ require 'rack/session/abstract/id' module ActionDispatch class Request < Rack::Request - # SessionHash is responsible to lazily load the session from store. + # Session is responsible for lazily loading the session from store. class Session # :nodoc: ENV_SESSION_KEY = Rack::Session::Abstract::ENV_SESSION_KEY # :nodoc: ENV_SESSION_OPTIONS_KEY = Rack::Session::Abstract::ENV_SESSION_OPTIONS_KEY # :nodoc: diff --git a/actionpack/lib/action_view/helpers/form_tag_helper.rb b/actionpack/lib/action_view/helpers/form_tag_helper.rb index ace457df2e..f16e33d08d 100644 --- a/actionpack/lib/action_view/helpers/form_tag_helper.rb +++ b/actionpack/lib/action_view/helpers/form_tag_helper.rb @@ -117,6 +117,10 @@ module ActionView # select_tag "destination", "<option>NYC</option><option>Paris</option><option>Rome</option>".html_safe, :disabled => true # # => <select disabled="disabled" id="destination" name="destination"><option>NYC</option> # # <option>Paris</option><option>Rome</option></select> + # + # select_tag "credit_card", options_for_select([ "VISA", "MasterCard" ], "MasterCard") + # # => <select id="credit_card" name="credit_card"><option>VISA</option> + # # <option selected="selected">MasterCard</option></select> def select_tag(name, option_tags = nil, options = {}) option_tags ||= "" html_name = (options[:multiple] == true && !name.to_s.ends_with?("[]")) ? "#{name}[]" : name |