aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view
Commit message (Collapse)AuthorAgeFilesLines
...
* Fix `content_tag_for` with array html option.Semyon Perepelitsa2013-01-311-1/+1
| | | | | | | | | | | | | | | | | It would embed array as string instead of joining it like `content_tag` does: content_tag(:td, class: ["foo", "bar"]){} #=> '<td class="foo bar"></td>' Before: content_tag_for(:td, item, class: ["foo", "bar"]){} #=> '<td class="item [&quot;foo&quot;, &quot;bar&quot;]" id="item_1"></td>' After: content_tag_for(:td, item, class: ["foo", "bar"]){} #=> '<td class="item foo bar" id="item_1"></td>'
* Merge pull request #9096 from tricknotes/fix-code-commentRafael Mendonça França2013-01-281-4/+4
|\ | | | | Fix code comment
| * Fix JavaScript syntax in code comment [ci skip]Ryunosuke SATO2013-01-291-4/+4
| |
* | Make current_url? work with a HEAD methodMichiel Sikkes2013-01-281-1/+1
|/ | | | | | ActionDispatch::Head was removed in favor of Rack::Head. But Rack::Head does not convert GET requests to HEAD requests so we need to do checking for HEAD requests ourselves.
* Use Encoding::UTF_8 constant :do_not_litter:Akira Matsuda2013-01-281-2/+2
|
* Use already defined Encoding constants rather than creating one-trip StringsAkira Matsuda2013-01-282-2/+2
|
* Merge remote-tracking branch 'docrails/master'Xavier Noria2013-01-264-2/+75
|\ | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/form_options_helper.rb guides/code/getting_started/app/controllers/comments_controller.rb
| * generic pass before merging docrailsXavier Noria2013-01-263-417/+55
| |
| * :scissors: "raise" duplicationAkira Matsuda2013-01-261-2/+1
| |
| * fix broken examples format in image_tag helper [ci skip]Francesco Rodriguez2013-01-181-0/+2
| |
| * repeating documentation for option form helpersThiago Pinto2013-01-171-0/+286
| |
| * repeating documentation for date and time form helpersThiago Pinto2013-01-171-0/+148
| |
* | Capture block so content won't leak.José Mota2013-01-212-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The [following pull request](https://github.com/rails/rails/pull/8916) fixed the block being passed to the appropriate helper method. However, the content being passed into the block is generating repeated markup on the page due to some weird ERb evaluation. This commit tries to capture the block's generated output so the page isn't flooded with markup. [Rafael França + José Mota] Closes #8936
* | Fix asset_path in mounted enginePiotr Sarnacki2013-01-211-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Historically serving assets from a mountable engine could be achieved by running ActionDispatch::Static as a part of engine middleware stack or to copy assets prefixed with an engine name. After introduction of assets pipeline this is not needed as all of the assets are served or compiled into main application's assets. This commit removes the obsolete line making asset_path always generate paths relative to the root or config.relative_url_root if it's set. (closes #8119)
* | Don't change the original i18n dataChris McGrath2013-01-171-1/+1
| |
* | Remove i18n symbol dependencyChris McGrath2013-01-171-0/+1
| | | | | | | | | | | | | | | | | | date.order is the only key in rails i18n that is required to be a symbol. This patch allows for symbols or strings which means: * No requirement for symbol type in .yml files. A future YAML.safe_load wouldn't need to load symbols * Rails could actually use json rather than yml as the backend
* | Fix date_select :selected option so you can pass it nilColin Burn-Murdoch2013-01-161-1/+1
| |
* | Merge pull request #8938 from colinbm/date_select_valueSteve Klabnik2013-01-142-1/+6
|\ \ | | | | | | Rename :value to :selected for date_select, and add missing tests/docs
| * | Rename :value option to :selected, in line with other select helpersColin Burn-Murdoch2013-01-142-1/+6
| | | | | | | | | | | | | | | Add tests for time & datetime. Add documentation.
* | | Revert benchmark helper regression. Use a #capture within a #benchmarkJeremy Kemper2013-01-142-15/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | block. Breaks benchmark calls that return non-String values otherwise. Revert "add benchmark helper that works in erb" This reverts commit 904e544cc8f5846de7c31827bb5556c6a238c0de. Conflicts: actionpack/lib/action_view/helpers.rb actionpack/lib/action_view/helpers/benchmark_helper.rb actionpack/test/template/benchmark_helper_test.rb
* | | Merge pull request #8916 from josemota/collection-with-blockRafael Mendonça França2013-01-131-4/+4
|\ \ \ | |/ / |/| | | | | | | | Collection radio buttons and collection check boxes through FormBuilder render the provided block. Closes #8897
| * | Collection radio buttons and collection check boxes through FormBuilder renderJosé Mota2013-01-121-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | the provided block. In the case of having a form_for method being called, the block for each collection would not be passed and thus the result expected was always the same. This patch passes the block to the original method like it would be assumed.
* | | Allow value to be set on date_selectColin Burn-Murdoch2013-01-131-1/+1
|/ /
* | Merge pull request #8623 from virusman/form_helpers_collectionproxy_fixJon Leighton2013-01-111-1/+1
|\ \ | | | | | | Fixed nested fields bug when called with AssociationProxy
| * | Test nested fields with AssociationProxy mockup & fix AssociationProxy ↵virusman2012-12-271-1/+1
| | | | | | | | | | | | support in form helper
* | | Remove redundant double quotation markszires2013-01-101-1/+1
| |/ |/|
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-01-093-6/+6
|\ \ | | | | | | | | | | | | Conflicts: guides/source/getting_started.md
| * | Revert "TODO typo fix"Akira Matsuda2013-01-041-1/+1
| | | | | | | | | | | | | | | | | | This reverts commit 1a59a6dfdca217e31a52779d92aa56b67c6689cb. I guess it's not a typo: https://github.com/jorlhuda/exceptron
| * | TODO typo fixGosha Arinich2013-01-041-1/+1
| | |
| * | PUT => PATCHAkira Matsuda2013-01-032-5/+5
| | |
| * | s/ERb/ERB/Akira Matsuda2013-01-021-1/+1
| | |
* | | view_cache_dependency APIJamis Buck2013-01-082-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A declarative API for specifying dependencies that affect template cache digest computation. In your controller, specify any of said dependencies: view_cache_dependency { "phone" if using_phone? } When the block is evaluated, the resulting value is included in the cache digest calculation, allowing you to generate different digests for effectively the same template. (Mostly useful if you're mucking with template load paths.)
* | | set 'alt' attribute for image_submit_tagNihad Abbasov2013-01-081-7/+7
| | |
* | | Do not generate local vars for partials without object or collectionCarlos Antonio da Silva2013-01-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Previously rendering a partial without giving :object or :collection would generate a local variable with the partial name by default. This was noticed due to warnings in Ruby 2.0 of not used variables, which turned out to be the generation of not used variables inside partials that do not contain objects related to them.
* | | These are already required through AS/railsAkira Matsuda2013-01-062-2/+0
| | | | | | | | | | | | | | | | | | | | | * core_ext/object/blank * concern * core_ext/class/attribute * deprecation
* | | Merge pull request #8777 from goshakkk/delegate-classAndrew White2013-01-061-1/+1
|\ \ \ | | | | | | | | Delegate to :class rather than 'self.class'
| * | | delegate to :class rather than 'self.class'Gosha Arinich2013-01-061-1/+1
| | | |
* | | | Refactor the logic that checks whether or not to emit the hidden id fieldCarlos Antonio da Silva2013-01-061-7/+6
| | | | | | | | | | | | | | | | | | | | By checking for object.persisted? first, we avoid the hash lookups for new objects.
* | | | Move the hidden :id field logic to where it belongs toCarlos Antonio da Silva2013-01-061-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When dealing with nested forms, Rails automatically generates a hidden field with the id value of the current object being generated by fields_for. This logic was inside the method that's available from the template object, but we just need it when really dealing with nested attributes, so moving the code to here makes more sense.
* | | | Eliminate the usage of parent_builder option from form_forCarlos Antonio da Silva2013-01-061-19/+15
| | | | | | | | | | | | | | | | Just use it internally from fields_for until we come up with a better solution.
* | | | Do not call fields_for from form_for, to avoid instantiating two buildersCarlos Antonio da Silva2013-01-061-5/+5
| | | |
* | | | Remove unnecessary begin..rescue..end, use only rescueAkira Matsuda2013-01-061-8/+6
|/ / /
* | | Fix documentation to content_tag_for [ci skip]Rafael Mendonça França2013-01-051-2/+2
| | |
* | | Merge pull request #8705 from amparo-luna/change_update_attributes_to_updateGuillermo Iguaran2013-01-033-6/+6
|\ \ \ | | | | | | | | Rename update_attributes method to update
| * | | Change docs to use update instead of update_attributesAmparo Luna + Guillermo Iguaran2013-01-033-6/+6
| | | |
* | | | Fix typo on form_tag_helper.rbPaulo Luis Franchini Casaretto2013-01-031-1/+1
| | | | | | | | | | | | | | | | The inline documentantion had a typo that was somewhat confusing.
* | | | take into account multipart when calculating tag attributesAaron Patterson2013-01-021-4/+7
| | | |
* | | | ask the form builder for form tag attributesAaron Patterson2013-01-021-2/+3
| | | |
* | | | do not mutate the options hash (when we do not need to)Aaron Patterson2013-01-021-2/+2
|/ / /
* / / Make content_tag_for work without blockRafael Mendonça França2013-01-021-1/+5
|/ / | | | | | | This is version of #8640 for master