aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/CHANGELOG2
-rw-r--r--actionpack/lib/action_controller/scaffolding.rb8
2 files changed, 6 insertions, 4 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 3453ae96be..087b355416 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Fixed that on validation errors, scaffold couldn't find template #654 [mindel]
+
* Added Base#hide_actions(*names) to hide public methods from a controller that would otherwise have been callable through the URL. For the majority of cases, its preferred just to make the methods you don't want to expose protected or private (so they'll automatically be hidden) -- but if you must have a public method, this is a way to make it uncallable. Base#hidden_actions retrieve the list of all hidden actions for the controller #644 [Nicholas Seckar]
* Fixed that a bunch of methods from ActionController::Base was accessible as actions (callable through a URL) when they shouldn't have been #644 [Nicholas Seckar]
diff --git a/actionpack/lib/action_controller/scaffolding.rb b/actionpack/lib/action_controller/scaffolding.rb
index 140df73972..52fc570a04 100644
--- a/actionpack/lib/action_controller/scaffolding.rb
+++ b/actionpack/lib/action_controller/scaffolding.rb
@@ -47,7 +47,7 @@ module ActionController
# flash["notice"] = "Entry was successfully created"
# redirect_to :action => "list"
# else
- # render "entry/new"
+ # render_scaffold('new')
# end
# end
#
@@ -64,7 +64,7 @@ module ActionController
# flash["notice"] = "Entry was successfully updated"
# redirect_to :action => "show/" + @entry.id.to_s
# else
- # render "entry/edit"
+ # render_scaffold('edit')
# end
# end
# end
@@ -126,7 +126,7 @@ module ActionController
flash["notice"] = "#{class_name} was successfully created"
redirect_to :action => "list#{suffix}"
else
- render "#{singular_name}/new#{suffix}"
+ render#{suffix}_scaffold('new')
end
end
@@ -143,7 +143,7 @@ module ActionController
flash["notice"] = "#{class_name} was successfully updated"
redirect_to :action => "show#{suffix}/" + @#{singular_name}.id.to_s
else
- render "#{singular_name}/edit#{suffix}"
+ render#{suffix}_scaffold('edit')
end
end