diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-01-20 16:51:14 -0200 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-01-20 16:51:14 -0200 |
| commit | 5a09f13a34426a02a305a12dfc90ced9bdd6c46e (patch) | |
| tree | 737837edd9d3e7903747c6698a05e53f261145ff | |
| parent | bf191318afb62a66fe37bd2649ecabfc4c8744a6 (diff) | |
| parent | 41722dd4440c992b3fd4e6181e9ddd0c7c3709e6 (diff) | |
| download | rails-5a09f13a34426a02a305a12dfc90ced9bdd6c46e.tar.gz rails-5a09f13a34426a02a305a12dfc90ced9bdd6c46e.tar.bz2 rails-5a09f13a34426a02a305a12dfc90ced9bdd6c46e.zip | |
Merge branch 'anilmaurya-master'
| -rw-r--r-- | railties/lib/rails/generators/resource_helpers.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/railties/lib/rails/generators/resource_helpers.rb b/railties/lib/rails/generators/resource_helpers.rb index a01eb57651..7329ee9f48 100644 --- a/railties/lib/rails/generators/resource_helpers.rb +++ b/railties/lib/rails/generators/resource_helpers.rb @@ -15,12 +15,10 @@ module Rails # Set controller variables on initialization. def initialize(*args) #:nodoc: super + controller_name = name if options[:model_name] - controller_name = name self.name = options[:model_name] assign_names!(self.name) - else - controller_name = name end if name == name.pluralize && name.singularize != name.pluralize && !options[:force_plural] |