Merge branch 'anilmaurya-master'
This commit is contained in:
commit
5a09f13a34
@ -15,12 +15,10 @@ def self.included(base) #:nodoc:
|
||||
# Set controller variables on initialization.
|
||||
def initialize(*args) #:nodoc:
|
||||
super
|
||||
if options[:model_name]
|
||||
controller_name = name
|
||||
if options[:model_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]
|
||||
|
Loading…
Reference in New Issue
Block a user