From cf56397ccd10174d94f60331e4a55ff765b3485b Mon Sep 17 00:00:00 2001
From: yalab <rudeboyjet@gmail.com>
Date: Wed, 20 Sep 2017 14:04:12 +0900
Subject: scaffold nested name controller should be fine.

---
 .../erb/scaffold/templates/_form.html.erb          |  2 +-
 .../erb/scaffold/templates/index.html.erb          |  8 ++---
 railties/lib/rails/generators/named_base.rb        | 35 ++++++++++++++++++++--
 .../scaffold_controller/templates/controller.rb    |  4 +--
 4 files changed, 39 insertions(+), 10 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb b/railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb
index 4f2e84f924..0eb9d82bbb 100644
--- a/railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb
+++ b/railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb
@@ -1,4 +1,4 @@
-<%%= form_with(model: <%= singular_table_name %>, local: true) do |form| %>
+<%%= form_with(model: <%= model_resource_name %>, local: true) do |form| %>
   <%% if <%= singular_table_name %>.errors.any? %>
     <div id="error_explanation">
       <h2><%%= pluralize(<%= singular_table_name %>.errors.count, "error") %> prohibited this <%= singular_table_name %> from being saved:</h2>
diff --git a/railties/lib/rails/generators/erb/scaffold/templates/index.html.erb b/railties/lib/rails/generators/erb/scaffold/templates/index.html.erb
index 5f4904fee1..e1ede7c713 100644
--- a/railties/lib/rails/generators/erb/scaffold/templates/index.html.erb
+++ b/railties/lib/rails/generators/erb/scaffold/templates/index.html.erb
@@ -18,9 +18,9 @@
 <% attributes.reject(&:password_digest?).each do |attribute| -%>
         <td><%%= <%= singular_table_name %>.<%= attribute.name %> %></td>
 <% end -%>
-        <td><%%= link_to 'Show', <%= singular_table_name %> %></td>
-        <td><%%= link_to 'Edit', edit_<%= singular_table_name %>_path(<%= singular_table_name %>) %></td>
-        <td><%%= link_to 'Destroy', <%= singular_table_name %>, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+        <td><%%= link_to 'Show', <%= model_resource_name %> %></td>
+        <td><%%= link_to 'Edit', edit_<%= singular_route_name %>_path(<%= singular_table_name %>) %></td>
+        <td><%%= link_to 'Destroy', <%= model_resource_name %>, method: :delete, data: { confirm: 'Are you sure?' } %></td>
       </tr>
     <%% end %>
   </tbody>
@@ -28,4 +28,4 @@
 
 <br>
 
-<%%= link_to 'New <%= singular_table_name.titleize %>', new_<%= singular_table_name %>_path %>
+<%%= link_to 'New <%= singular_table_name.titleize %>', new_<%= singular_route_name %>_path %>
diff --git a/railties/lib/rails/generators/named_base.rb b/railties/lib/rails/generators/named_base.rb
index fe8447be23..5f602f1d52 100644
--- a/railties/lib/rails/generators/named_base.rb
+++ b/railties/lib/rails/generators/named_base.rb
@@ -100,11 +100,11 @@ module Rails
         end
 
         def index_helper # :doc:
-          uncountable? ? "#{plural_table_name}_index" : plural_table_name
+          uncountable? ? "#{plural_route_name}_index" : plural_route_name
         end
 
         def show_helper # :doc:
-          "#{singular_table_name}_url(@#{singular_table_name})"
+          "#{singular_route_name}_url(@#{singular_table_name})"
         end
 
         def edit_helper # :doc:
@@ -112,7 +112,7 @@ module Rails
         end
 
         def new_helper # :doc:
-          "new_#{singular_table_name}_url"
+          "new_#{singular_route_name}_url"
         end
 
         def field_id(attribute_name)
@@ -152,6 +152,35 @@ module Rails
           end
         end
 
+        def redirect_resource_name # :doc:
+          model_resource_name(prefix: "@")
+        end
+
+        def model_resource_name(prefix: "") # :doc:
+          resource_name = "#{prefix}#{singular_table_name}"
+          if controller_class_path.empty?
+            resource_name
+          else
+            "[#{controller_class_path.map { |name| ":" + name }.join(", ")}, #{resource_name}]"
+          end
+        end
+
+        def singular_route_name # :doc:
+          if controller_class_path.empty?
+            singular_table_name
+          else
+            "#{controller_class_path.join('_')}_#{singular_table_name}"
+          end
+        end
+
+        def plural_route_name # :doc:
+          if controller_class_path.empty?
+            plural_table_name
+          else
+            "#{controller_class_path.join('_')}_#{plural_table_name}"
+          end
+        end
+
         def assign_names!(name)
           @class_path = name.include?("/") ? name.split("/") : name.split("::")
           @class_path.map!(&:underscore)
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 42b9e34274..05f1c2b2d3 100644
--- a/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
+++ b/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
@@ -29,7 +29,7 @@ class <%= controller_class_name %>Controller < ApplicationController
     @<%= singular_table_name %> = <%= orm_class.build(class_name, "#{singular_table_name}_params") %>
 
     if @<%= orm_instance.save %>
-      redirect_to @<%= singular_table_name %>, notice: <%= "'#{human_name} was successfully created.'" %>
+      redirect_to <%= redirect_resource_name %>, notice: <%= "'#{human_name} was successfully created.'" %>
     else
       render :new
     end
@@ -38,7 +38,7 @@ class <%= controller_class_name %>Controller < ApplicationController
   # PATCH/PUT <%= route_url %>/1
   def update
     if @<%= orm_instance.update("#{singular_table_name}_params") %>
-      redirect_to @<%= singular_table_name %>, notice: <%= "'#{human_name} was successfully updated.'" %>
+      redirect_to <%= redirect_resource_name %>, notice: <%= "'#{human_name} was successfully updated.'" %>
     else
       render :edit
     end
-- 
cgit v1.2.3