aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorRahul P. Chaudhari <rahul100885@gmail.com>2013-02-09 22:40:45 +0530
committerRahul P. Chaudhari <rahul100885@gmail.com>2013-02-10 01:19:02 +0530
commitafdb84a1fe6694b667a06a8bfe77a5c5fbce837d (patch)
tree6f13860deebee4f8e260dc378485ad24ed4705f3 /railties
parentda483d3f307a725d10fa3888df07d0bcbb14a0d2 (diff)
downloadrails-afdb84a1fe6694b667a06a8bfe77a5c5fbce837d.tar.gz
rails-afdb84a1fe6694b667a06a8bfe77a5c5fbce837d.tar.bz2
rails-afdb84a1fe6694b667a06a8bfe77a5c5fbce837d.zip
Added notice message for destroy method in scaffold
Diffstat (limited to 'railties')
-rw-r--r--railties/CHANGELOG.md4
-rw-r--r--railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb2
-rw-r--r--railties/test/generators/scaffold_controller_generator_test.rb1
3 files changed, 6 insertions, 1 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index f86baee4c3..c2e47f1e09 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,5 +1,9 @@
## Rails 4.0.0 (unreleased) ##
+* Added notice message for destroy action in scaffold generator
+
+ *Rahul P. Chaudhari*
+
* Add --rc option to support the load of a custom rc file during the generation of a new app.
*Amparo Luna*
diff --git a/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb b/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
index e813437d75..72281a2fef 100644
--- a/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
+++ b/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
@@ -47,7 +47,7 @@ class <%= controller_class_name %>Controller < ApplicationController
# DELETE <%= route_url %>/1
def destroy
@<%= orm_instance.destroy %>
- redirect_to <%= index_helper %>_url
+ redirect_to <%= index_helper %>_url, notice: <%= "'#{human_name} was successfully destroyed.'" %>
end
private
diff --git a/railties/test/generators/scaffold_controller_generator_test.rb b/railties/test/generators/scaffold_controller_generator_test.rb
index c34ce285e3..013cb78252 100644
--- a/railties/test/generators/scaffold_controller_generator_test.rb
+++ b/railties/test/generators/scaffold_controller_generator_test.rb
@@ -39,6 +39,7 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
assert_instance_method :destroy, content do |m|
assert_match(/@user\.destroy/, m)
+ assert_match(/User was successfully destroyed/, m)
end
assert_instance_method :set_user, content do |m|