kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Default to yielding a form variable.

Browse source 
More intention revealing and means `f` can go F itself 😋
This commit is contained in:
Kasper Timm Hansen 2017-03-20 19:57:56 +01:00
parent 8534d2e179
commit 8ff7ca5d11
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb
View file

@ -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? %> <%% if <%= singular_table_name %>.errors.any? %>
<div id="error_explanation"> <div id="error_explanation">
<h2><%%= pluralize(<%= singular_table_name %>.errors.count, "error") %> prohibited this <%= singular_table_name %> from being saved:</h2> <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| -%> <% attributes.each do |attribute| -%>
<div class="field"> <div class="field">
<% if attribute.password_digest? -%> <% if attribute.password_digest? -%>
<%%= f.label :password %> <%%= form.label :password %>
<%%= f.password_field :password %> <%%= form.password_field :password %>
</div> </div>
<div class="field"> <div class="field">
<%%= f.label :password_confirmation %> <%%= form.label :password_confirmation %>
<%%= f.password_field :password_confirmation %> <%%= form.password_field :password_confirmation %>
<% else -%> <% else -%>
<%%= f.label :<%= attribute.column_name %> %> <%%= form.label :<%= attribute.column_name %> %>
<%%= f.<%= attribute.field_type %> :<%= attribute.column_name %> %> <%%= form.<%= attribute.field_type %> :<%= attribute.column_name %> %>
<% end -%> <% end -%>
</div> </div>
<% end -%> <% end -%>
<div class="actions"> <div class="actions">
<%%= f.submit %> <%%= form.submit %>
</div> </div>
<%% end %> <%% end %>

8
railties/test/generators/scaffold_generator_test.rb
View file

@ -437,8 +437,8 @@ class ScaffoldGeneratorTest < Rails::Generators::TestCase
end end
assert_file "app/views/accounts/_form.html.erb" do |content| assert_file "app/views/accounts/_form.html.erb" do |content|
assert_match(/^\W{4}<%= f\.text_field :name %>/, content) assert_match(/^\W{4}<%= form\.text_field :name %>/, content)
assert_match(/^\W{4}<%= f\.text_field :currency_id %>/, content) assert_match(/^\W{4}<%= form\.text_field :currency_id %>/, content)
end end
end end
@ -461,8 +461,8 @@ class ScaffoldGeneratorTest < Rails::Generators::TestCase
end end
assert_file "app/views/users/_form.html.erb" do |content| assert_file "app/views/users/_form.html.erb" do |content|
assert_match(/<%= f\.password_field :password %>/, content) assert_match(/<%= form\.password_field :password %>/, content)
assert_match(/<%= f\.password_field :password_confirmation %>/, content) assert_match(/<%= form\.password_field :password_confirmation %>/, content)
end end
assert_file "app/views/users/index.html.erb" do |content| assert_file "app/views/users/index.html.erb" do |content|