diff options
| author | José Valim <jose.valim@gmail.com> | 2009-07-01 20:12:29 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-07-02 10:27:40 +0200 |
| commit | 1a4d8aca8a675aa02cead4b1db53ba5a3f9aa326 (patch) | |
| tree | 788c5de55db47408ee4e1376ba1cdc11d3923b5c /railties/lib/generators/erb | |
| parent | 86ff07410145430d08e97a8296486c4cd4304cde (diff) | |
| download | rails-1a4d8aca8a675aa02cead4b1db53ba5a3f9aa326.tar.gz rails-1a4d8aca8a675aa02cead4b1db53ba5a3f9aa326.tar.bz2 rails-1a4d8aca8a675aa02cead4b1db53ba5a3f9aa326.zip | |
Added tests to scaffold controller.
Diffstat (limited to 'railties/lib/generators/erb')
| -rw-r--r-- | railties/lib/generators/erb/scaffold/scaffold_generator.rb | 5 | ||||
| -rw-r--r-- | railties/lib/generators/erb/scaffold/templates/show.html.erb | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/railties/lib/generators/erb/scaffold/scaffold_generator.rb b/railties/lib/generators/erb/scaffold/scaffold_generator.rb index c8723785f4..ad40fe47ae 100644 --- a/railties/lib/generators/erb/scaffold/scaffold_generator.rb +++ b/railties/lib/generators/erb/scaffold/scaffold_generator.rb @@ -6,9 +6,10 @@ module Erb include Rails::Generators::ControllerNamedBase argument :attributes, :type => :hash, :default => {}, :banner => "field:type field:type" + class_option :singleton, :type => :boolean, :desc => "Supply to skip index action" + class_option :layout, :type => :boolean - # TODO Spec me def copy_index_file return if options[:singleton] copy_view :index @@ -26,8 +27,8 @@ module Erb copy_view :new end - # TODO invoke_if? def copy_layout_file + return unless options[:layout] template "layout.html.erb", File.join("app/views/layouts", controller_class_path, "#{controller_file_name}.html.erb") end diff --git a/railties/lib/generators/erb/scaffold/templates/show.html.erb b/railties/lib/generators/erb/scaffold/templates/show.html.erb index adecaf70c6..25567957be 100644 --- a/railties/lib/generators/erb/scaffold/templates/show.html.erb +++ b/railties/lib/generators/erb/scaffold/templates/show.html.erb @@ -1,10 +1,10 @@ <% for attribute in attributes -%> <p> - <b><%= attribute.column.human_name %>:</b> + <b><%= attribute.human_name %>:</b> <%%=h @<%= singular_name %>.<%= attribute.name %> %> </p> <% end -%> <%%= link_to 'Edit', edit_<%= singular_name %>_path(@<%= singular_name %>) %> | -<%%= link_to 'Back', <%= plural_name %>_path %>
\ No newline at end of file +<%%= link_to 'Back', <%= plural_name %>_path %> |