aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators/erb/scaffold/templates
diff options
context:
space:
mode:
authoryuuji.yaginuma <yuuji.yaginuma@gmail.com>2019-05-04 09:14:10 +0900
committeryuuji.yaginuma <yuuji.yaginuma@gmail.com>2019-05-05 09:55:37 +0900
commit85a8bc644be69908f05740a5886ec19cd3679df5 (patch)
tree370f8c6a877d578c1d77fe45f25cb3d937a1f4d0 /railties/lib/rails/generators/erb/scaffold/templates
parentac1ba44f8d46ebbbe6889629d263e5690631f6a1 (diff)
downloadrails-85a8bc644be69908f05740a5886ec19cd3679df5.tar.gz
rails-85a8bc644be69908f05740a5886ec19cd3679df5.tar.bz2
rails-85a8bc644be69908f05740a5886ec19cd3679df5.zip
Make generated test work even when using virtual attributes
The virtual attributes(`attachment` and `rich_text`) can't set value with `fill_in`. So avoid using it. Once #35885 is merged, will be modified to use it. Also, add checking attachment attached or not for avoiding `DelegationError` when attachment didn't attach.
Diffstat (limited to 'railties/lib/rails/generators/erb/scaffold/templates')
-rw-r--r--railties/lib/rails/generators/erb/scaffold/templates/show.html.erb.tt2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/erb/scaffold/templates/show.html.erb.tt b/railties/lib/rails/generators/erb/scaffold/templates/show.html.erb.tt
index 6b216001d2..d3f996188c 100644
--- a/railties/lib/rails/generators/erb/scaffold/templates/show.html.erb.tt
+++ b/railties/lib/rails/generators/erb/scaffold/templates/show.html.erb.tt
@@ -4,7 +4,7 @@
<p>
<strong><%= attribute.human_name %>:</strong>
<% if attribute.attachment? -%>
- <%%= link_to @<%= singular_table_name %>.<%= attribute.column_name %>.filename, @<%= singular_table_name %>.<%= attribute.column_name %> %>
+ <%%= link_to @<%= singular_table_name %>.<%= attribute.column_name %>.filename, @<%= singular_table_name %>.<%= attribute.column_name %> if @<%= singular_table_name %>.<%= attribute.column_name %>.attached? %>
<% elsif attribute.attachments? -%>
<%% @<%= singular_table_name %>.<%= attribute.column_name %>.each do |<%= attribute.singular_name %>| %>
<div><%%= link_to <%= attribute.singular_name %>.filename, <%= attribute.singular_name %> %></div>