aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-06-05 11:42:19 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-06-05 11:42:19 -0700
commit634755410991419bab9048f81279bd6a48d7f6b4 (patch)
tree7b4181b267ec8bfe0f07eee77c2f496d122cf5a3 /railties
parent9f52d1526c816a35ec7bcc6e85f27b51d010dbae (diff)
parentfc092a9cba5fceec38358072e50e09250cf58840 (diff)
downloadrails-634755410991419bab9048f81279bd6a48d7f6b4.tar.gz
rails-634755410991419bab9048f81279bd6a48d7f6b4.tar.bz2
rails-634755410991419bab9048f81279bd6a48d7f6b4.zip
Merge pull request #6613 from carlosgaldino/3-2-data-confirm
Deprecate `:confirm` in favor of `:data => { :confirm => 'Text' }` option
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/erb/scaffold/templates/index.html.erb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/erb/scaffold/templates/index.html.erb b/railties/lib/rails/generators/erb/scaffold/templates/index.html.erb
index 7b1a2a1841..a7c12b9026 100644
--- a/railties/lib/rails/generators/erb/scaffold/templates/index.html.erb
+++ b/railties/lib/rails/generators/erb/scaffold/templates/index.html.erb
@@ -17,7 +17,7 @@
<% end -%>
<td><%%= link_to 'Show', <%= singular_table_name %> %></td>
<td><%%= link_to 'Edit', edit_<%= singular_table_name %>_path(<%= singular_table_name %>) %></td>
- <td><%%= link_to 'Destroy', <%= singular_table_name %>, <%= key_value :confirm, "'Are you sure?'" %>, <%= key_value :method, ":delete" %> %></td>
+ <td><%%= link_to 'Destroy', <%= singular_table_name %>, <%= key_value :method, ":delete" %>, <%= key_value :data, "{ #{key_value :confirm, "'Are you sure?'"} }" %> %></td>
</tr>
<%% end %>
</table>