diff options
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/rails_generator/generators/components/scaffold_resource/templates/controller.rb | 39 |
2 files changed, 20 insertions, 21 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 912d1947a7..8a9f1ace56 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* scaffold_resource generator uses _path named routes and head instead of render :nothing => true. #6545 [Josh Susser] + * Generator can show diff on file collision to help you decide whether to skip or overwrite. #6364 [jeffw, Jeremy Kemper] * Generated directories are recursively svn added, like mkdir -p. #6416 [NeilW] diff --git a/railties/lib/rails_generator/generators/components/scaffold_resource/templates/controller.rb b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/controller.rb index 110a4688fa..5f2fcde744 100644 --- a/railties/lib/rails_generator/generators/components/scaffold_resource/templates/controller.rb +++ b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/controller.rb @@ -9,23 +9,23 @@ class <%= controller_class_name %>Controller < ApplicationController format.xml { render :xml => @<%= table_name %>.to_xml } end end - + # GET /<%= table_name %>/1 # GET /<%= table_name %>/1.xml def show @<%= file_name %> = <%= class_name %>.find(params[:id]) - + respond_to do |format| format.html # show.rhtml format.xml { render :xml => @<%= file_name %>.to_xml } end end - + # GET /<%= table_name %>/new def new @<%= file_name %> = <%= class_name %>.new end - + # GET /<%= table_name %>/1;edit def edit @<%= file_name %> = <%= class_name %>.find(params[:id]) @@ -35,48 +35,45 @@ class <%= controller_class_name %>Controller < ApplicationController # POST /<%= table_name %>.xml def create @<%= file_name %> = <%= class_name %>.new(params[:<%= file_name %>]) - + respond_to do |format| if @<%= file_name %>.save flash[:notice] = '<%= class_name %> was successfully created.' - - format.html { redirect_to <%= file_name %>_url(@<%= file_name %>) } - format.xml do - headers["Location"] = <%= file_name %>_url(@<%= file_name %>) - render :nothing => true, :status => "201 Created" - end + format.html { redirect_to <%= file_name %>_path(@<%= file_name %>) } + format.xml { head :created, :location => <%= file_name %>_path(@<%= file_name %>) } else format.html { render :action => "new" } format.xml { render :xml => @<%= file_name %>.errors.to_xml } end end end - + # PUT /<%= table_name %>/1 # PUT /<%= table_name %>/1.xml def update @<%= file_name %> = <%= class_name %>.find(params[:id]) - + respond_to do |format| if @<%= file_name %>.update_attributes(params[:<%= file_name %>]) - format.html { redirect_to <%= file_name %>_url(@<%= file_name %>) } - format.xml { render :nothing => true } + flash[:notice] = '<%= class_name %> was successfully updated.' + format.html { redirect_to <%= file_name %>_path(@<%= file_name %>) } + format.xml { head :ok } else format.html { render :action => "edit" } - format.xml { render :xml => @<%= file_name %>.errors.to_xml } + format.xml { render :xml => @<%= file_name %>.errors.to_xml } end end end - + # DELETE /<%= table_name %>/1 # DELETE /<%= table_name %>/1.xml def destroy @<%= file_name %> = <%= class_name %>.find(params[:id]) @<%= file_name %>.destroy - + respond_to do |format| - format.html { redirect_to <%= table_name %>_url } - format.xml { render :nothing => true } + format.html { redirect_to <%= table_name %>_path } + format.xml { head :ok } end end -end
\ No newline at end of file +end |