aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-04-19 11:04:38 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-04-19 11:04:38 +0000
commit5462358cd397583f3b4cfcdf2933b80dbc48d353 (patch)
tree76a1da3d0859755c0b1af53c031d6689940739df
parent0dd497853a5375caa217237e067346ad2b3d89c2 (diff)
downloadrails-5462358cd397583f3b4cfcdf2933b80dbc48d353.tar.gz
rails-5462358cd397583f3b4cfcdf2933b80dbc48d353.tar.bz2
rails-5462358cd397583f3b4cfcdf2933b80dbc48d353.zip
Fixed that :get, :post, and the others should take a flash array as the third argument just like process #1144 [rails@cogentdude.com]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1227 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r--actionpack/CHANGELOG2
-rw-r--r--actionpack/lib/action_controller/test_process.rb4
-rwxr-xr-xactiverecord/lib/active_record/associations.rb3
3 files changed, 7 insertions, 2 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 7b5614afc5..c263f0700d 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Fixed that :get, :post, and the others should take a flash array as the third argument just like process #1144 [rails@cogentdude.com]
+
* Fixed a problem with Flash.now
* Fixed stringification on all assigned hashes. The sacrifice is that assigns[:person] won't work in testing. Instead assigns["person"] or assigns(:person) must be used. In other words, the keys of assigns stay strings but we've added a method-based accessor to appease the need for symbols.
diff --git a/actionpack/lib/action_controller/test_process.rb b/actionpack/lib/action_controller/test_process.rb
index a68887e8cc..f7dc275c2f 100644
--- a/actionpack/lib/action_controller/test_process.rb
+++ b/actionpack/lib/action_controller/test_process.rb
@@ -258,9 +258,9 @@ module Test
# execute the request simulating a specific http method and set/volley the response
%w( get post put delete head ).each do |method|
class_eval <<-EOV
- def #{method}(action, parameters = nil, session = nil)
+ def #{method}(action, parameters = nil, session = nil, flash = nil)
@request.env['REQUEST_METHOD'] = "#{method.upcase}"
- process(action, parameters, session)
+ process(action, parameters, session, flash)
end
EOV
end
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb
index 59eb437c45..5f206f5472 100755
--- a/activerecord/lib/active_record/associations.rb
+++ b/activerecord/lib/active_record/associations.rb
@@ -146,6 +146,9 @@ module ActiveRecord
# Please note that because eager loading is fetching both models and associations in the same grab, it doesn't make sense to use the
# :limit property and it will be ignored if attempted.
#
+ # Also have in mind that since the eager loading is pulling from multiple tables, you'll have to disambiguate any column references
+ # in both conditions and orders. So :order => "posts.id DESC" will work while :order => "id DESC" will not.
+ #
# == Modules
#
# By default, associations will look for objects within the current module scope. Consider: