0
@@ -32,7 +32,7 @@ module Mack
0
       # Raise Mack::Errors::RequiredGeneratorParameterMissing if a required parameter
0
       # is missing.
0
       def initialize(env = {})
0
-        @env = env
0
+        @env = env.to_hash
0
         self.class.required_params.each do |p|
0
           raise Mack::Errors::RequiredGeneratorParameterMissing.new(p) unless param(p)
0
         end

0
@@ -47,7 +47,7 @@ class ScaffoldGenerator < Mack::Generator::Base
0
       template(File.join(temp_dir, "generic", "app", "views", "edit.html.erb.template"), File.join(app_views_dir, "edit.html.erb"), :force => param(:force))
0
       template(File.join(temp_dir, "generic", "app", "views", "new.html.erb.template"), File.join(app_views_dir, "new.html.erb"), :force => param(:force))
0
       template(File.join(temp_dir, "generic", "app", "views", "show.html.erb.template"), File.join(app_views_dir, "show.html.erb"), :force => param(:force))
0
-      ModelGenerator.new("NAME" => param(:name)).run
0
+      ModelGenerator.new(@env).run
0
     else
0
       template(File.join(temp_dir, "no_orm", "app", "controllers", "controller.rb.template"), File.join(app_cont_dir, "#{@name_plural}_controller.rb"), :force => param(:force))
0
     end

0
@@ -5,11 +5,13 @@
0
 <form action="<%%= <%= @name_singular %>s_update_url(:id => @<%= @name_singular %>.id) %>" class="edit_<%= @name_singular %>" id="edit_<%= @name_singular %>" method="<%= @name_singular %>">
0
   <input type="hidden" name="_method" value="put">
0
 <% for column in columns -%>
0
+<% unless column.column_name == "created_at" || column.column_name == "updated_at" -%>
0
   <p>
0
     <b><%= column.column_name.singular.camelcase %></b><br />
0
     <%= column.form_field %>
0
   </p>
0
 <% end -%>
0
+<% end -%>
0
   <p>
0
     <input id="<%= @name_singular %>_submit" name="commit" type="submit" value="Create" />
0
   </p>

0
@@ -4,11 +4,13 @@
0
 
0
 <form action="<%%= <%= @name_singular %>s_create_url %>" class="new_<%= @name_singular %>" id="new_<%= @name_singular %>" method="<%= @name_singular %>">
0
 <% for column in columns -%>
0
+<% unless column.column_name == "created_at" || column.column_name == "updated_at" -%>
0
   <p>
0
     <b><%= column.column_name.singular.camelcase %></b><br />
0
     <%= column.form_field %>
0
   </p>
0
 <% end -%>
0
+<% end -%>
0
   <p>
0
     <input id="<%= @name_singular %>_submit" name="commit" type="submit" value="Create" />
0
   </p>

0
@@ -212,7 +212,7 @@ CONT
0
   private
0
   
0
   def orm_common_with_cols
0
-    sg = ScaffoldGenerator.new("name" => "zoo", "cols" => "name:string,description:text")
0
+    sg = ScaffoldGenerator.new("name" => "zoo", "cols" => "name:string,description:text,created_at:datetime,updated_at:datetime")
0
     sg.run
0
     File.open(File.join(MACK_CONFIG, "routes.rb")) do |f|
0
       assert_match "r.resource :zoos # Added by rake generate:scaffold name=zoo", f.read
0
@@ -249,12 +249,16 @@ ERB
0
   <tr>
0
     <th>Name</th>
0
     <th>Description</th>
0
+    <th>CreatedAt</th>
0
+    <th>UpdatedAt</th>
0
   </tr>
0
 
0
 <% for zoo in @zoos %>
0
   <tr>
0
     <td><%= zoo.name %></td>
0
     <td><%= zoo.description %></td>
0
+    <td><%= zoo.created_at %></td>
0
+    <td><%= zoo.updated_at %></td>
0
     <td><%= link_to("Show", zoos_show_url(:id => zoo.id)) %></td>
0
     <td><%= link_to("Edit", zoos_edit_url(:id => zoo.id)) %></td>
0
     <td><%= link_to("Delete", zoos_delete_url(:id => zoo.id), :method => :delete, :confirm => "Are you sure?") %></td>
0
@@ -304,6 +308,14 @@ ERB
0
   <b>Description</b><br />
0
   <%= @zoo.description %>
0
 </p>
0
+<p>
0
+  <b>CreatedAt</b><br />
0
+  <%= @zoo.created_at %>
0
+</p>
0
+<p>
0
+  <b>UpdatedAt</b><br />
0
+  <%= @zoo.updated_at %>
0
+</p>
0
 
0
 <%= link_to("Edit", zoos_edit_url(:id => @zoo.id)) %> |
0
 <%= link_to("Back", zoos_index_url) %>