diff options
| author | AvnerCohen <israbirding@gmail.com> | 2012-10-09 22:56:26 +0200 |
|---|---|---|
| committer | AvnerCohen <israbirding@gmail.com> | 2012-10-09 22:56:26 +0200 |
| commit | b49f159e24d310aa5457cb0ccecbe9b638fe6886 (patch) | |
| tree | 7f8bf04e7dae92a4552ea8310a733a2ad91e1ac6 /actionpack | |
| parent | 0787cea3bb5e6f2c216e71090732bc55ee03c7dc (diff) | |
| download | rails-b49f159e24d310aa5457cb0ccecbe9b638fe6886.tar.gz rails-b49f159e24d310aa5457cb0ccecbe9b638fe6886.tar.bz2 rails-b49f159e24d310aa5457cb0ccecbe9b638fe6886.zip | |
moving to new hash syntax, for discussion before I take the time on full folders
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/base.rb | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 6b8d9384d4..9b3bf99fc3 100644 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -43,7 +43,7 @@ module ActionController # # def server_ip # location = request.env["SERVER_ADDR"] - # render :text => "This server hosted at #{location}" + # render text: "This server hosted at #{location}" # end # # == Parameters @@ -113,9 +113,9 @@ module ActionController # def search # @results = Search.find(params[:query]) # case @results.count - # when 0 then render :action => "no_results" - # when 1 then render :action => "show" - # when 2..10 then render :action => "show_many" + # when 0 then render action: "no_results" + # when 1 then render action: "show" + # when 2..10 then render action: "show_many" # end # end # @@ -131,7 +131,7 @@ module ActionController # @entry = Entry.new(params[:entry]) # if @entry.save # # The entry was saved correctly, redirect to show - # redirect_to :action => 'show', :id => @entry.id + # redirect_to action: 'show', id: @entry.id # else # # things didn't go so well, do something else # end @@ -148,15 +148,15 @@ module ActionController # An action may contain only a single render or a single redirect. Attempting to try to do either again will result in a DoubleRenderError: # # def do_something - # redirect_to :action => "elsewhere" - # render :action => "overthere" # raises DoubleRenderError + # redirect_to action: "elsewhere" + # render action: "overthere" # raises DoubleRenderError # end # # If you need to redirect on the condition of something, then be sure to add "and return" to halt execution. # # def do_something - # redirect_to(:action => "elsewhere") and return if monkeys.nil? - # render :action => "overthere" # won't be called if monkeys is nil + # redirect_to(action: "elsewhere") and return if monkeys.nil? + # render action: "overthere" # won't be called if monkeys is nil # end # class Base < Metal |