github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary argument for creating scopes

Browse Source
This commit is contained in:
Pratik Naik
2010-04-03 01:22:42 +01:00
parent 47c99f9012
commit 684e4d39d6
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
activerecord/lib/active_record/named_scope.rb
View File

@@ -107,7 +107,7 @@ module ActiveRecord
"Overwriting existing method #{self.name}.#{name}."
end
scopes[name] = lambda do |parent_scope, *args|
scopes[name] = lambda do |*args|
scope_options = case options
when Hash, Relation
options
@@ -116,9 +116,9 @@ module ActiveRecord
end
relation = if scope_options.is_a?(Hash)
parent_scope.scoped.apply_finder_options(scope_options)
scoped.apply_finder_options(scope_options)
else
scope_options ? parent_scope.scoped.merge(scope_options) : parent_scope.scoped
scope_options ? scoped.merge(scope_options) : scoped
end
block_given? ? relation.extending(Module.new(&block)) : relation
@@ -126,7 +126,7 @@ module ActiveRecord
singleton_class.instance_eval do
define_method name do |*args|
scopes[name].call(self, *args)
scopes[name].call(*args)
end
end
end