Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Scaffold resource is now scaffold

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6746 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 056fdc74d52833ac2755713e990bd9f3f9a8c415 1 parent 4f2a950
@dhh dhh authored
Showing with 7 additions and 7 deletions.
  1. 0  railties/lib/rails_generator/generators/components/{scaffold_resource → scaffold}/USAGE
  2. 0  ...ib/rails_generator/generators/components/{scaffold_resource → scaffold}/scaffold_resource_generator.rb
  3. 0  railties/lib/rails_generator/generators/components/{scaffold_resource → scaffold}/templates/controller.rb
  4. 0  railties/lib/rails_generator/generators/components/{scaffold_resource → scaffold}/templates/fixtures.yml
  5. 0  .../lib/rails_generator/generators/components/{scaffold_resource → scaffold}/templates/functional_test.rb
  6. 0  railties/lib/rails_generator/generators/components/{scaffold_resource → scaffold}/templates/helper.rb
  7. 0  ...ies/lib/rails_generator/generators/components/{scaffold_resource → scaffold}/templates/layout.html.erb
  8. 0  railties/lib/rails_generator/generators/components/{scaffold_resource → scaffold}/templates/migration.rb
  9. 0  railties/lib/rails_generator/generators/components/{scaffold_resource → scaffold}/templates/model.rb
  10. 0  railties/lib/rails_generator/generators/components/{scaffold_resource → scaffold}/templates/style.css
  11. 0  railties/lib/rails_generator/generators/components/{scaffold_resource → scaffold}/templates/unit_test.rb
  12. +3 −3 .../lib/rails_generator/generators/components/{scaffold_resource → scaffold}/templates/view_edit.html.erb
  13. +2 −2 ...lib/rails_generator/generators/components/{scaffold_resource → scaffold}/templates/view_index.html.erb
  14. +2 −2 ...s/lib/rails_generator/generators/components/{scaffold_resource → scaffold}/templates/view_new.html.erb
  15. 0  .../lib/rails_generator/generators/components/{scaffold_resource → scaffold}/templates/view_show.html.erb
View
0  ...tor/generators/components/scaffold_resource/USAGE → ...ls_generator/generators/components/scaffold/USAGE
File renamed without changes
View
0  .../scaffold_resource/scaffold_resource_generator.rb → ...omponents/scaffold/scaffold_resource_generator.rb
File renamed without changes
View
0  ...ponents/scaffold_resource/templates/controller.rb → ...ators/components/scaffold/templates/controller.rb
File renamed without changes
View
0  ...mponents/scaffold_resource/templates/fixtures.yml → ...rators/components/scaffold/templates/fixtures.yml
File renamed without changes
View
0  ...ts/scaffold_resource/templates/functional_test.rb → .../components/scaffold/templates/functional_test.rb
File renamed without changes
View
0  .../components/scaffold_resource/templates/helper.rb → ...enerators/components/scaffold/templates/helper.rb
File renamed without changes
View
0  ...nents/scaffold_resource/templates/layout.html.erb → ...ors/components/scaffold/templates/layout.html.erb
File renamed without changes
View
0  ...mponents/scaffold_resource/templates/migration.rb → ...rators/components/scaffold/templates/migration.rb
File renamed without changes
View
0  ...s/components/scaffold_resource/templates/model.rb → ...generators/components/scaffold/templates/model.rb
File renamed without changes
View
0  .../components/scaffold_resource/templates/style.css → ...enerators/components/scaffold/templates/style.css
File renamed without changes
View
0  ...mponents/scaffold_resource/templates/unit_test.rb → ...rators/components/scaffold/templates/unit_test.rb
File renamed without changes
View
6 ...ts/scaffold_resource/templates/view_edit.html.erb → .../components/scaffold/templates/view_edit.html.erb
@@ -2,7 +2,7 @@
<%%= error_messages_for :<%= singular_name %> %>
-<%% form_for(:<%= singular_name %>, :url => <%= singular_name %>_path(@<%= singular_name %>), :html => { :method => :put }) do |f| %>
+<%% form_for(@<%= singular_name %>) do |f| %>
<% for attribute in attributes -%>
<p>
<b><%= attribute.column.human_name %></b><br />
@@ -11,9 +11,9 @@
<% end -%>
<p>
- <%%= submit_tag "Update" %>
+ <%%= f.submit "Update" %>
</p>
<%% end %>
-<%%= link_to 'Show', <%= singular_name %>_path(@<%= singular_name %>) %> |
+<%%= link_to 'Show', @<%= singular_name %> %> |
<%%= link_to 'Back', <%= plural_name %>_path %>
View
4 ...s/scaffold_resource/templates/view_index.html.erb → ...components/scaffold/templates/view_index.html.erb
@@ -12,9 +12,9 @@
<% for attribute in attributes -%>
<td><%%=h <%= singular_name %>.<%= attribute.name %> %></td>
<% end -%>
- <td><%%= link_to 'Show', <%= singular_name %>_path(<%= singular_name %>) %></td>
+ <td><%%= link_to 'Show', <%= singular_name %> %></td>
<td><%%= link_to 'Edit', edit_<%= singular_name %>_path(<%= singular_name %>) %></td>
- <td><%%= link_to 'Destroy', <%= singular_name %>_path(<%= singular_name %>), :confirm => 'Are you sure?', :method => :delete %></td>
+ <td><%%= link_to 'Destroy', <%= singular_name %>), :confirm => 'Are you sure?', :method => :delete %></td>
</tr>
<%% end %>
</table>
View
4 ...nts/scaffold_resource/templates/view_new.html.erb → ...s/components/scaffold/templates/view_new.html.erb
@@ -2,7 +2,7 @@
<%%= error_messages_for :<%= singular_name %> %>
-<%% form_for(:<%= singular_name %>, :url => <%= plural_name %>_path) do |f| %>
+<%% form_for(@<%= singular_name %>) do |f| %>
<% for attribute in attributes -%>
<p>
<b><%= attribute.column.human_name %></b><br />
@@ -11,7 +11,7 @@
<% end -%>
<p>
- <%%= submit_tag "Create" %>
+ <%%= f.submit "Create" %>
</p>
<%% end %>
View
0  ...ts/scaffold_resource/templates/view_show.html.erb → .../components/scaffold/templates/view_show.html.erb
File renamed without changes
Please sign in to comment.
Something went wrong with that request. Please try again.