diff options
Diffstat (limited to 'railties/generators/scaffold/templates')
| -rw-r--r-- | railties/generators/scaffold/templates/controller.rb | 7 | ||||
| -rw-r--r-- | railties/generators/scaffold/templates/view_show.rhtml | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/railties/generators/scaffold/templates/controller.rb b/railties/generators/scaffold/templates/controller.rb index 15ade4c49b..7ccb517bee 100644 --- a/railties/generators/scaffold/templates/controller.rb +++ b/railties/generators/scaffold/templates/controller.rb @@ -1,6 +1,4 @@ -class <%= class_name %>Controller < ApplicationController - layout 'scaffold' - +class <%= @controller_class_name %>Controller < ApplicationController <% unless suffix -%> def index list @@ -41,8 +39,7 @@ class <%= class_name %>Controller < ApplicationController def update @<%= singular_name %> = <%= class_name %>.find(@params['<%= singular_name %>']['id']) - @<%= singular_name %>.attributes = @params['<%= singular_name %>'] - if @<%= singular_name %>.save + if @<%= singular_name %>.update_attributes(@params['<%= singular_name %>']) flash['notice'] = '<%= class_name %> was successfully updated.' redirect_to :action => 'show<%= suffix %>', :id => @<%= singular_name %>.id else diff --git a/railties/generators/scaffold/templates/view_show.rhtml b/railties/generators/scaffold/templates/view_show.rhtml index 30a3242f14..ba8f3616dd 100644 --- a/railties/generators/scaffold/templates/view_show.rhtml +++ b/railties/generators/scaffold/templates/view_show.rhtml @@ -1,6 +1,6 @@ <%% for column in <%= class_name %>.content_columns %> <p> - <b><%%= column.human_name %>:</b> <%%= @<%= singular_name %>[column.name] %> + <b><%%= column.human_name %>:</b> <%%= @<%= singular_name %>.send(column.name) %> </p> <%% end %> |