From 41722dd4440c992b3fd4e6181e9ddd0c7c3709e6 Mon Sep 17 00:00:00 2001 From: anilmaurya Date: Mon, 20 Jan 2014 14:37:53 +0530 Subject: moving controller_name assignment before model name condition --- railties/lib/rails/generators/resource_helpers.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'railties/lib/rails/generators/resource_helpers.rb') 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] -- cgit v1.2.3