github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-31 09:18:17 -05:00
Code Issues Packages Projects Releases Wiki Activity
4,962 Commits 34 Branches 105 Tags
f7bb3ddce85dcafe8ae2c52f7b7fbd53b0859732
Commit Graph

61 Commits

Author SHA1 Message Date
Rick Olson
fa3618d375 add test case for js.erb partials on *.js formatted requests 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6735 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-05-15 03:15:36 +00:00
Rick Olson
80074cb4de Assume that rendered partials go by the HTML format by default 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6734 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-05-15 03:13:32 +00:00
Rick Olson
f86ff9fd52 oops! forgot new layout for layout tests 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6554 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-04-24 01:26:44 +00:00
Rick Olson
eb7a3045e3 apply [6543] to edge. Closes #5044 [tpope] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6545 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-04-20 21:44:08 +00:00
Rick Olson
e0f8342676 Change default respond_to templates for xml and rjs formats. [Rick] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6507 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-04-08 17:16:36 +00:00
Rick Olson
da6f5a1cb4 Change ActionView template defaults. Look for templates using the request format first, such as show.html.erb or show.xml.builder, before looking for the old defaults like show.erb or show.builder [Rick] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6499 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-04-02 00:02:11 +00:00
Jeremy Kemper
d20b943551 Deprecation: privatize deprecated render_partial and render_partial_collection methods. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6404 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-03-13 05:06:41 +00:00
Jeremy Kemper
83c8db9818 Deprecation: remove deprecated instance variables. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6399 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-03-13 03:49:52 +00:00
David Heinemeier Hansson
f95dfff966 Added helper(:all) as a way to include all helpers from app/helpers/**/*.rb in ApplicationController [DHH] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6221 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-02-24 20:31:34 +00:00
David Heinemeier Hansson
21187c0fb4 Apply the rest of Chads patch 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6180 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-02-21 00:29:44 +00:00
David Heinemeier Hansson
e105653066 Added .erb and .builder as preferred aliases to the now deprecated .rhtml and .rxml extensions [Chad Fowler]. This is done to separate the renderer from the mime type. .erb templates are often used to render emails, atom, csv, whatever. So labeling them .rhtml doesn't make too much sense. The same goes for .rxml, which can be used to build everything from HTML to Atom to whatever. .rhtml and .rxml will continue to work until Rails 3.0, though. So this is a slow phasing out. All generators and examples will start using the new aliases, though. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6178 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-02-20 22:09:12 +00:00
David Heinemeier Hansson
aad7fbde68 Added caching option to AssetTagHelper#stylesheet_link_tag and AssetTagHelper#javascript_include_tag [DHH] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6164 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-02-18 23:54:20 +00:00
Rick Olson
69b0e5c44a Allow Controllers to have multiple view_paths instead of a single template_root. Closes #2754 [John Long] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6120 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-02-04 20:47:05 +00:00
Jeremy Kemper
d5f642294c test javascript include with and without application.js 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5875 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-01-08 17:30:46 +00:00
Jeremy Kemper
f0753992ab test controller rescues 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5504 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-11-13 02:03:50 +00:00
Jeremy Kemper
080ec9803e Fix invalid test fixture exposed by stricter Ruby 1.8.5 multipart parsing. Closes #6524. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5429 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-11-05 02:40:44 +00:00
Jeremy Kemper
d15d15b2c2 Deprecate @response 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5207 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-09-29 08:26:45 +00:00
Jeremy Kemper
d7b5b44a0e Deprecate @headers 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5206 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-09-29 08:12:16 +00:00
Jeremy Kemper
4f3bf6cb23 Deprecate @cookies 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5205 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-09-29 08:04:39 +00:00
Jeremy Kemper
d7674637f9 Deprecation: @request will be removed after 1.2. Use the request method instead. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5201 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-09-29 07:34:02 +00:00
Jeremy Kemper
0b61be4666 use :dependent => :destroy rather than :dependent => true 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5160 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-09-22 00:11:33 +00:00
Rick Olson
ec030534b1 test default content type for implicit rjs template render 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5143 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-09-18 16:32:41 +00:00
David Heinemeier Hansson
caa8a00520 Added that respond_to blocks will automatically set the content type to be the same as is requested [DHH] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5131 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-09-17 18:10:25 +00:00
David Heinemeier Hansson
2caf4d5a93 Added proper getters and setters for content type and charset [DHH] Added utf-8 as the default charset for all renders. You can change this default using ActionController::Base.default_charset=(encoding) [DHH] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5129 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-09-17 16:20:32 +00:00
Rick Olson
5360e47431 added passing test for using partials with an xml builder 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5044 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-09-06 03:51:45 +00:00
Jeremy Kemper
96c6ca369a Deprecation: test deprecated instance vars in partials. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4824 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-08-26 05:58:16 +00:00
David Heinemeier Hansson
91383e0426 Added automated timestamping to AssetTagHelper methods for stylesheets, javascripts, and images when Action Controller is run under Rails [DHH] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4098 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-03-29 20:57:53 +00:00
David Heinemeier Hansson
cc6e8ae57a Removed XML argument style for respond_to, so type.xml(object.to_xml) no longer works -- it wasnt worth the exception 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3944 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-03-18 21:17:14 +00:00
David Heinemeier Hansson
f22f352ee3 Added easy support for testing file uploads with fixture_file_upload (closes #4105) [turnip@turnipspatch.com] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3939 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-03-18 20:10:52 +00:00
Jamis Buck
b2122159b1 fix broken respond_to test 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3934 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-03-18 17:15:22 +00:00
David Heinemeier Hansson
7d06259be9 Dots in template path should not trip up rendering (closes #4244) [lmarlow@yahoo.com] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3884 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-03-16 02:51:19 +00:00
David Heinemeier Hansson
de660957a5 Added defaults to respond_to [DHH] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3842 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-03-12 03:39:58 +00:00
David Heinemeier Hansson
6e3e5cadfb Added option to render action/template/file of a specific extension (and here by template type). This means you can have multiple templates with the same name but a different extension [DHH] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3841 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-03-12 01:56:55 +00:00
David Heinemeier Hansson
2d491bddf7 Fixed tests (closes #4087) [Rick Olson] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3774 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-03-05 16:41:04 +00:00
David Heinemeier Hansson
3d1b51b441 Added .rxml (and any non-rhtml template, really) supportfor CaptureHelper#content_for and CaptureHelper#capture #3287 [Brian Takita] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3669 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-02-26 19:47:50 +00:00
Michael Koziarski
d49a5fcb4c * Fix pagination problems when using include 
* Introduce Unit Tests for pagination
* Allow count to work with :include by using count distinct.

[Kevin Clark & Jeremy Hopple]


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3553 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-02-09 09:17:40 +00:00
Marcel Molina
4793a2f5cd Automatically discover layouts when a controller is namespaced. Closes #2199, #3424. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3423 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-01-15 11:28:55 +00:00
Marcel Molina
751b6be464 Allow auto-discovery of third party template library layouts. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3397 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-01-12 07:16:23 +00:00
Marcel Molina
233208b8bb Don't try to strip out the controller name if default_action_name is nil 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3321 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-12-20 05:32:39 +00:00
Sam Stephenson
bea737eb5a Make ActionController's render honor the :locals option when rendering a :file. Closes #1665. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3157 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-11-22 08:37:04 +00:00
Marcel Molina
06e74b6c91 Add support for new rjs templates which wrap an update_page block. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3078 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-11-17 21:28:59 +00:00
Jeremy Kemper
85baf07be8 Controllers with acronyms in their names (e.g. PDFController) require the correct default helper (PDFHelper in file pdf_helper.rb). Closes #2262. Do not raise an exception when default helper is missing; log a debug message instead. It's nice to delete empty helpers. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2938 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-11-08 08:23:13 +00:00
David Heinemeier Hansson
cb0e27cee9 Fix that render :text didn't interpolate instance variables (Closes #2629, #2626) [skaes] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2777 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-10-28 07:33:54 +00:00
Nicholas Seckar
86a571090c Reset template variables after using render_to_string. Closes #2559 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2723 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-10-25 02:15:08 +00:00
Jeremy Kemper
5d19fd7841 Unit tests and fixtures for multipart posts. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2389 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-09-28 08:19:26 +00:00
David Heinemeier Hansson
e3c02d8c66 Fixed that render :partial would fail when :object was a Hash (due to backwards compatibility issues) #2148 [Sam Stephenson] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2160 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-09-09 07:27:44 +00:00
Jamis Buck
e758c2e9db Yield @content_for_ variables to templates #2058 [Sam Stephenson] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2094 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-09-01 21:51:27 +00:00
David Heinemeier Hansson
d9033bbb28 Demonstrate breakage better 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1941 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-07-27 12:06:19 +00:00
David Heinemeier Hansson
e95dd53a5d Added two failing tests for partials with locals from controller 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1937 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-07-27 09:11:00 +00:00
David Heinemeier Hansson
1ae0a53d86 Fixed regression for content_for #1820 [Stefan Kaes] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1911 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-07-24 13:20:29 +00:00