diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-01-11 20:18:55 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-01-11 20:18:55 +0530 |
| commit | 7c29246b8c810ca7b736ad8a28bc94b4a22d22da (patch) | |
| tree | a4e2d357cb5274d7c826ea2beb1f35af30f5a9bf /actionpack/lib/action_controller | |
| parent | 3f8f96e9802c7f628f5b3abd48624e26d97e5ad9 (diff) | |
| parent | ce41a368865c341faa0b98b0851b56ba6be6eafb (diff) | |
| download | rails-7c29246b8c810ca7b736ad8a28bc94b4a22d22da.tar.gz rails-7c29246b8c810ca7b736ad8a28bc94b4a22d22da.tar.bz2 rails-7c29246b8c810ca7b736ad8a28bc94b4a22d22da.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/base.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 98bfe72fef..b6d441d544 100644 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -121,7 +121,7 @@ module ActionController # # def search # @results = Search.find(params[:query]) - # case @results + # case @results.count # when 0 then render :action => "no_results" # when 1 then render :action => "show" # when 2..10 then render :action => "show_many" diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index e9cdb7fbef..fce6e29d5f 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -251,6 +251,7 @@ module ActionController # def test_create # json = {:book => { :title => "Love Hina" }}.to_json # post :create, json + # end # # == Special instance variables # |