User content_for for titles in the application layout (rails#49702)

lazaronixon · web-flow · commit 42ca4de42952 · 2024-01-02T17:39:35.000+01:00
diff --git a/railties/lib/rails/generators/erb/scaffold/templates/edit.html.erb.tt b/railties/lib/rails/generators/erb/scaffold/templates/edit.html.erb.tt
@@ -1,3 +1,5 @@
+<%% content_for :title, "Editing <%= human_name.downcase %>" %>
+
 <h1>Editing <%= human_name.downcase %></h1>
 
 <%%= render "form", <%= singular_table_name %>: @<%= singular_table_name %> %>
diff --git a/railties/lib/rails/generators/erb/scaffold/templates/index.html.erb.tt b/railties/lib/rails/generators/erb/scaffold/templates/index.html.erb.tt
@@ -1,5 +1,7 @@
 <p style="color: green"><%%= notice %></p>
 
+<%% content_for :title, "<%= human_name.pluralize %>" %>
+
 <h1><%= human_name.pluralize %></h1>
 
 <div id="<%= plural_table_name %>">
diff --git a/railties/lib/rails/generators/erb/scaffold/templates/new.html.erb.tt b/railties/lib/rails/generators/erb/scaffold/templates/new.html.erb.tt
@@ -1,3 +1,5 @@
+<%% content_for :title, "New <%= human_name.downcase %>" %>
+
 <h1>New <%= human_name.downcase %></h1>
 
 <%%= render "form", <%= singular_table_name %>: @<%= singular_table_name %> %>
diff --git a/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt b/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title><%= camelized %></title>
+    <title><%%= content_for(:title) || "<%= camelized %>" %></title>
     <meta name="viewport" content="width=device-width,initial-scale=1">
     <%%= csrf_meta_tags %>
     <%%= csp_meta_tag %>
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
@@ -442,7 +442,7 @@ def test_application_names_are_not_singularized
 
   def test_application_name_is_normalized_in_config
     run_generator [File.join(destination_root, "MyWebSite"), "-d", "postgresql"]
-    assert_file "MyWebSite/app/views/layouts/application.html.erb", /<title>MyWebSite<\/title>/
+    assert_file "MyWebSite/app/views/layouts/application.html.erb", /<title><%= content_for(:title) || "MyWebSite" %><\/title>/
     assert_file "MyWebSite/config/database.yml", /my_web_site_production/
   end
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+<%% content_for :title, "Editing <%= human_name.downcase %>" %>`
	`2`	`+`
`1`	`3`	`<h1>Editing <%= human_name.downcase %></h1>`
`2`	`4`
`3`	`5`	`<%%= render "form", <%= singular_table_name %>: @<%= singular_table_name %> %>`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+<%% content_for :title, "New <%= human_name.downcase %>" %>`
	`2`	`+`
`1`	`3`	`<h1>New <%= human_name.downcase %></h1>`
`2`	`4`
`3`	`5`	`<%%= render "form", <%= singular_table_name %>: @<%= singular_table_name %> %>`