Commit Graph

1243 Commits

Author SHA1 Message Date
Pratik Naik
a04f022877 Delegate ivars to controller instead of copying
Reduce number of instance variables being copied from controller to
view. Instead, delegate them to controller instance.
2008-04-21 11:53:14 +01:00
gbuesing
f757f58388 select_datetime and select_time default to Time.zone.now when config.time_zone is set 2008-04-21 00:40:04 -05:00
gbuesing
c2c779044f datetime_select defaults to Time.zone.now when config.time_zone is set 2008-04-21 00:08:45 -05:00
Pratik Naik
2b69840e5e Remove ActionController::Base#view_controller_internals
Get rid of ActionController::Base#view_controller_internals flag and
use @@protected_view_variables for storing the list of controller
specific instance variables which should be inaccessible inside views.
2008-04-21 03:45:38 +01:00
Paul Horsfall
14a40804a2 Add conditional options to caches_page method [#25 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2008-04-19 16:21:34 -05:00
Pratik Naik
3f8d3cd04f Remove unused ignore_missing_templates option 2008-04-19 19:26:56 +01:00
Joshua Peek
17d4164a16 Introduce ActionView::TestCase for testing view helpers. 2008-04-19 13:08:24 -05:00
Pratik Naik
ef4c65088f Move missing template logic to ActionView 2008-04-19 18:59:13 +01:00
Pratik Naik
534c6b2444 Introduce ActionView::InlineTemplate class 2008-04-19 16:21:18 +01:00
Pratik Naik
986aec5dbb Refactor Dispatcher callbacks to remove unnecessary Dependencies checks in production environment. 2008-04-18 13:05:43 +01:00
Joshua Peek
745359a494 Stub out Dispatcher#log_failsafe_exception method to please the test gods. 2008-04-15 18:04:12 -05:00
Joshua Peek
93641f30b7 Merge branch 'master' of git://github.com/stephencelis/rails 2008-04-14 15:01:47 -05:00
David Heinemeier Hansson
420c4b3d88 Added Rails.public_path to control where HTML and assets are expected to be loaded from (defaults to Rails.root + "/public") #11581 [nicksieger] 2008-04-13 17:33:27 -05:00
Stephen Celis
89237fe07e Scripts and styles with multiple dots in the filename should cache 2008-04-12 18:43:38 -05:00
Michael Koziarski
60be4b09f5 Merge branch 'master' into custom_paths_for_resource_names 2008-04-12 12:40:51 +12:00
Michael Koziarski
063c393bf0 Allow alternative values for the 'new' and 'edit' actions in resourceful routes.
map.resource :schools, :as => 'escuelas', :path_names => { :new => 'nueva' }

Closes #11181.  [ivanvr]
2008-04-12 12:40:40 +12:00
Jeremy Kemper
9a7ab8b05b stub the instance method, there is no class method 2008-04-11 16:46:46 -07:00
David Heinemeier Hansson
e89093aeb4 Fixed that formatted_polymorphic_route should be able to take the :format as part of a single hash or as the option hash (references #8741) 2008-04-11 12:34:44 -05:00
Rick Olson
4d594cffcf Automatically parse posted JSON content for Mime::JSON requests. [rick]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9242 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2008-04-08 05:05:54 +00:00
Rick Olson
0ff7a2d89f add json_escape ERB util to escape html entities in json strings that are output in HTML pages. [rick]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9241 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2008-04-08 04:52:01 +00:00
Josh Peek
917423d664 Provide a helper proxy to access helper methods from outside views. Closes #10839 [Josh Peek]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9234 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2008-04-06 18:42:34 +00:00
Pratik Naik
1e087fd3fd Ensure RJS redirect_to doesn't html-escapes string argument. Closes #8546
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9212 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2008-04-02 12:48:59 +00:00
Jeremy Kemper
30fa377f33 Ruby 1.9 compat: encoding and multibyte test fixes
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9194 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2008-04-01 07:39:04 +00:00
Jeremy Kemper
ecdddc4de5 Ruby 1.9 compat: proc arity
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9190 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2008-04-01 06:11:56 +00:00
Jeremy Kemper
a2ad945627 style & whitespace
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9189 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2008-04-01 06:11:48 +00:00
Jeremy Kemper
b79f7d127a Ruby 1.9: no args is 0 arity, not -1 as in 1.8
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9187 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2008-04-01 06:11:31 +00:00
Jeremy Kemper
dd3c0ae95c Missed adds. References #11491.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9178 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2008-04-01 00:56:59 +00:00
Jeremy Kemper
9cc478a254 Support render :partial => collection of heterogeneous elements. Closes #11491.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9177 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2008-04-01 00:50:09 +00:00
Jeremy Kemper
a61b63d420 Avoid remote_ip spoofing
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9124 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2008-03-28 21:38:01 +00:00
Jeremy Kemper
5c0656c9ee Fix layouts in symlinked paths. Closes #9136 [court3nay, caio]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9120 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2008-03-28 20:54:26 +00:00
Jeremy Kemper
6efee90bf2 Missing :js template falls back to :html, so you don't have to explicitly specify template format everywhere, breaking old code
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9119 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2008-03-28 20:21:52 +00:00
David Heinemeier Hansson
4e69ed0656 Add missing file
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9117 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2008-03-28 20:17:21 +00:00
David Heinemeier Hansson
db3a60eb92 Added support for regexp flags like ignoring case in the :requirements part of routes declarations (closes #11421) [NeilW]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9115 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2008-03-28 20:01:21 +00:00
David Heinemeier Hansson
388e5d3fac Fixed that ActionController::Base#read_multipart would fail if boundary was exactly 10240 bytes (closes #10886) [ariejan]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9113 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2008-03-28 19:55:31 +00:00
David Heinemeier Hansson
c57254d449 Fixed HTML::Tokenizer (used in sanitize helper) didnt handle unclosed CDATA tags (closes #10071) [esad, packagethief]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9111 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2008-03-28 19:45:32 +00:00
Jeremy Kemper
4942e5b1cb Whitespace + formatting
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9089 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2008-03-25 21:27:57 +00:00
David Heinemeier Hansson
b0bfcca16e Fixed that FormHelper#radio_button would produce invalid ids (closes #11298) [harlancrystal]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9088 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2008-03-24 21:32:50 +00:00
David Heinemeier Hansson
123f5a357d Added :confirm option to submit_tag (closes #11415) [miloops]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9087 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2008-03-24 21:24:40 +00:00
David Heinemeier Hansson
0e62c773f6 Fixed NumberHelper#number_with_precision to properly round in a way that works equally on Mac, Windows, Linux (closes #11409, #8275, #10090, #8027) [zhangyuanyi]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9086 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2008-03-24 21:12:55 +00:00
Rick Olson
5bf4cbbdb7 Allow the #simple_format text_helper to take an html_options hash for each paragraph. Closes #2448 [Francois Beausoleil, thechrisoshow]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9083 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2008-03-24 02:29:30 +00:00
Rick Olson
0381398708 Fix regression from filter refactoring where re-adding a skipped filter resulted in it being called twice. [rick]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9080 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2008-03-23 01:48:17 +00:00
Jeremy Kemper
f2840f508d Fix an edge case with extra periods in Routing.normalize_paths. Closes #11337 [cavalle, veejar]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9069 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2008-03-21 22:44:04 +00:00
Jeremy Kemper
d8f76e66a1 Missed adds. References #10350.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9066 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2008-03-20 16:51:06 +00:00
Jeremy Kemper
bd940d98bd Re-added ActionView::Helpers::register_javascript/stylesheet_expansion to make it easier for plugin developers to inject multiple assets. Closes #10350.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9065 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2008-03-20 16:26:04 +00:00
David Heinemeier Hansson
54213dadfd Docfixes (closes #11356, #11172, #10523)
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9064 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2008-03-20 02:15:29 +00:00
Jeremy Kemper
e87d3e3335 Revert [9106]. References #10350.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9063 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2008-03-19 19:56:07 +00:00
Jeremy Kemper
856a4dcf12 Refactor filters to use Active Support callbacks. Closes #11235.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9055 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2008-03-18 17:56:05 +00:00
David Heinemeier Hansson
db08329946 Fixed that polymorphic routes would modify the input array (closes #11363) [thomas.lee]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9053 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2008-03-17 23:45:42 +00:00
David Heinemeier Hansson
3c0fd445c0 Added :format option to NumberHelper#number_to_currency to enable better localization support #11149 [lylo]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9052 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2008-03-17 22:08:25 +00:00
David Heinemeier Hansson
5f5822af37 Fixed that TextHelper#excerpt would include one character too many (closes #11268) [Irfy]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9030 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2008-03-15 19:59:34 +00:00