Merge branch 'anilmaurya-master'

2014-01-20 16:51:14 -02:00 · 2014-01-20 16:51:14 -02:00 · 5a09f13a34
commit 5a09f13a34
parent bf191318af 41722dd444
1 changed files with 1 additions and 3 deletions
--- a/railties/lib/rails/generators/resource_helpers.rb
+++ b/railties/lib/rails/generators/resource_helpers.rb
@ -15,12 +15,10 @@ def self.included(base) #:nodoc:
      # 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]