1 files changed, 10 insertions, 62 deletions

diff --git a/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb b/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
index 4baad85e9e..e813437d75 100644
--- a/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
+++ b/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
@@ -7,95 +7,47 @@ class <%= controller_class_name %>Controller < ApplicationController
   before_action :set_<%= singular_table_name %>, only: [:show, :edit, :update, :destroy]
 
   # GET <%= route_url %>
-  # GET <%= route_url %>.json
   def index
     @<%= plural_table_name %> = <%= orm_class.all(class_name) %>
-
-    respond_to do |format|
-      <%- if options[:html] -%>
-      format.html # index.html.erb
-      <%- end -%>
-      format.json { render json: <%= "@#{plural_table_name}" %> }
-    end
   end
 
   # GET <%= route_url %>/1
-  # GET <%= route_url %>/1.json
   def show
-    respond_to do |format|
-      <%- if options[:html] -%>
-      format.html # show.html.erb
-      <%- end -%>
-      format.json { render json: <%= "@#{singular_table_name}" %> }
-    end
   end
 
-  <%- if options[:html] -%>
   # GET <%= route_url %>/new
-  # GET <%= route_url %>/new.json
   def new
     @<%= singular_table_name %> = <%= orm_class.build(class_name) %>
-
-    respond_to do |format|
-      format.html # new.html.erb
-      format.json { render json: <%= "@#{singular_table_name}" %> }
-    end
   end
 
   # GET <%= route_url %>/1/edit
   def edit
   end
-  <%- end -%>
 
   # POST <%= route_url %>
-  # POST <%= route_url %>.json
   def create
     @<%= singular_table_name %> = <%= orm_class.build(class_name, "#{singular_table_name}_params") %>
 
-    respond_to do |format|
-      if @<%= orm_instance.save %>
-        <%- if options[:html] -%>
-        format.html { redirect_to @<%= singular_table_name %>, notice: <%= "'#{human_name} was successfully created.'" %> }
-        <%- end -%>
-        format.json { render json: <%= "@#{singular_table_name}" %>, status: :created, location: <%= "@#{singular_table_name}" %> }
-      else
-        <%- if options[:html] -%>
-        format.html { render action: "new" }
-        <%- end -%>
-        format.json { render json: <%= "@#{orm_instance.errors}" %>, status: :unprocessable_entity }
-      end
+    if @<%= orm_instance.save %>
+      redirect_to @<%= singular_table_name %>, notice: <%= "'#{human_name} was successfully created.'" %>
+    else
+      render action: 'new'
     end
   end
 
   # PATCH/PUT <%= route_url %>/1
-  # PATCH/PUT <%= route_url %>/1.json
   def update
-    respond_to do |format|
-      if @<%= orm_instance.update_attributes("#{singular_table_name}_params") %>
-        <%- if options[:html] -%>
-        format.html { redirect_to @<%= singular_table_name %>, notice: <%= "'#{human_name} was successfully updated.'" %> }
-        <%- end -%>
-        format.json { head :no_content }
-      else
-        <%- if options[:html] -%>
-        format.html { render action: "edit" }
-        <%- end -%>
-        format.json { render json: <%= "@#{orm_instance.errors}" %>, status: :unprocessable_entity }
-      end
+    if @<%= orm_instance.update("#{singular_table_name}_params") %>
+      redirect_to @<%= singular_table_name %>, notice: <%= "'#{human_name} was successfully updated.'" %>
+    else
+      render action: 'edit'
     end
   end
 
   # DELETE <%= route_url %>/1
-  # DELETE <%= route_url %>/1.json
   def destroy
     @<%= orm_instance.destroy %>
-
-    respond_to do |format|
-      <%- if options[:html] -%>
-      format.html { redirect_to <%= index_helper %>_url }
-      <%- end -%>
-      format.json { head :no_content }
-    end
+    redirect_to <%= index_helper %>_url
   end
 
   private
@@ -104,11 +56,7 @@ class <%= controller_class_name %>Controller < ApplicationController
       @<%= singular_table_name %> = <%= orm_class.find(class_name, "params[:id]") %>
     end
 
-    # Use this method to whitelist the permissible parameters. Example:
-    #   params.require(:person).permit(:name, :age)
-    #
-    # Also, you can specialize this method with per-user checking of permissible
-    # attributes.
+    # Never trust parameters from the scary internet, only allow the white list through.
     def <%= "#{singular_table_name}_params" %>
       <%- if attributes_names.empty? -%>
       params[<%= ":#{singular_table_name}" %>]