From bed8882372b59a4ff1e4932f82fd4d5331cd05da Mon Sep 17 00:00:00 2001
From: Giovanni Cappellotto <potomak84@gmail.com>
Date: Thu, 1 May 2014 17:21:16 +0200
Subject: Avoid unnecessary conditional block

GeneratedAttribute#column_name checks already for reference? on the
attribute returning the right name to use as symbol for label and field.
---
 railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb | 5 -----
 1 file changed, 5 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 10f80abb15..da99e74435 100644
--- a/railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb
+++ b/railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb
@@ -21,13 +21,8 @@
     <%%= f.label :password_confirmation %><br>
     <%%= f.password_field :password_confirmation %>
 <% else -%>
-  <%- if attribute.reference? -%>
     <%%= f.label :<%= attribute.column_name %> %><br>
     <%%= f.<%= attribute.field_type %> :<%= attribute.column_name %> %>
-  <%- else -%>
-    <%%= f.label :<%= attribute.name %> %><br>
-    <%%= f.<%= attribute.field_type %> :<%= attribute.name %> %>
-  <%- end -%>
 <% end -%>
   </div>
 <% end -%>
-- 
cgit v1.2.3