From bd1b24199a71f7b2a171cce69b8e0e9b1c77f8b2 Mon Sep 17 00:00:00 2001
From: Ivan Velasquez <ivan.velasquez.rios@gmail.com>
Date: Mon, 13 Mar 2017 19:37:40 -0600
Subject: user form with instead of form for in scaffold generator

---
 railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb')

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 519b6c8603..8fd85ffb8a 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_for(<%= singular_table_name %>) do |f| %>
+<%%= form_with(model: <%= singular_table_name %>) do |f| %>
   <%% 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>
-- 
cgit v1.2.3


From 031487568d8f1e8147602dd42c877f475bdc046c Mon Sep 17 00:00:00 2001
From: Ivan Velasquez <ivan.velasquez.rios@gmail.com>
Date: Tue, 14 Mar 2017 08:40:25 -0600
Subject: disable remote submits

---
 railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb')

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 8fd85ffb8a..ac8a568071 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 %>) do |f| %>
+<%%= form_with(model: <%= singular_table_name %>, local: true) do |f| %>
   <%% 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>
-- 
cgit v1.2.3


From 8ff7ca5d112a5db5c1449f687e5bdc15e3670579 Mon Sep 17 00:00:00 2001
From: Kasper Timm Hansen <kaspth@gmail.com>
Date: Mon, 20 Mar 2017 19:57:56 +0100
Subject: Default to yielding a `form` variable.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

More intention revealing and means `f` can go F itself 😋
---
 .../generators/erb/scaffold/templates/_form.html.erb     | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb')

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 ac8a568071..73c00ad41a 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 |f| %>
+<%%= form_with(model: <%= singular_table_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>
@@ -14,21 +14,21 @@
 <% attributes.each do |attribute| -%>
   <div class="field">
 <% if attribute.password_digest? -%>
-    <%%= f.label :password %>
-    <%%= f.password_field :password %>
+    <%%= form.label :password %>
+    <%%= form.password_field :password %>
   </div>
 
   <div class="field">
-    <%%= f.label :password_confirmation %>
-    <%%= f.password_field :password_confirmation %>
+    <%%= form.label :password_confirmation %>
+    <%%= form.password_field :password_confirmation %>
 <% else -%>
-    <%%= f.label :<%= attribute.column_name %> %>
-    <%%= f.<%= attribute.field_type %> :<%= attribute.column_name %> %>
+    <%%= form.label :<%= attribute.column_name %> %>
+    <%%= form.<%= attribute.field_type %> :<%= attribute.column_name %> %>
 <% end -%>
   </div>
 
 <% end -%>
   <div class="actions">
-    <%%= f.submit %>
+    <%%= form.submit %>
   </div>
 <%% end %>
-- 
cgit v1.2.3


From 27f103fc7e3260efe0b8dde66bf5354f2202ee32 Mon Sep 17 00:00:00 2001
From: Yves Senn <yves.senn@gmail.com>
Date: Sun, 26 Mar 2017 11:42:39 +0200
Subject: add field ids when generating a scaffold form.

This is a follow up to a6d065e. When using `form_with` you must supply
field ids manually. Since the scaffold generator is using labels we
need to make sure that they are linked up properly.
---
 railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb')

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 73c00ad41a..4f2e84f924 100644
--- a/railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb
+++ b/railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb
@@ -15,15 +15,15 @@
   <div class="field">
 <% if attribute.password_digest? -%>
     <%%= form.label :password %>
-    <%%= form.password_field :password %>
+    <%%= form.password_field :password, id: :<%= field_id(:password) %> %>
   </div>
 
   <div class="field">
     <%%= form.label :password_confirmation %>
-    <%%= form.password_field :password_confirmation %>
+    <%%= form.password_field :password_confirmation, id: :<%= field_id(:password_confirmation) %> %>
 <% else -%>
     <%%= form.label :<%= attribute.column_name %> %>
-    <%%= form.<%= attribute.field_type %> :<%= attribute.column_name %> %>
+    <%%= form.<%= attribute.field_type %> :<%= attribute.column_name %>, id: :<%= field_id(attribute.column_name) %> %>
 <% end -%>
   </div>
 
-- 
cgit v1.2.3