diff options
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG.md | 11 | ||||
| -rw-r--r-- | railties/lib/rails/generators/erb/scaffold/templates/index.html.erb | 2 |
2 files changed, 9 insertions, 4 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index 5bffe75244..2537993df3 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -1,16 +1,21 @@ ## Rails 3.2.8 ## -* No changes. +* ERB scaffold generator use the `:data => { :confirm => "Text" }` syntax instead of `:confirm`. + + *Rafael Mendonça França* + ## Rails 3.2.7 (Jul 26, 2012) ## -* Since Rails 3.2, use layout false to render no layout -* Use strict_args_position! if available from Thor +* Since Rails 3.2, use layout false to render no layout +* Use strict_args_position! if available from Thor + ## Rails 3.2.6 (Jun 12, 2012) ## * No changes. + ## Rails 3.2.4 (May 31, 2012) ## * Add hook for resource route's generator. *Santiago Pastorino* 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> |