summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/redmine/pagination.rb17
1 files changed, 0 insertions, 17 deletions
diff --git a/lib/redmine/pagination.rb b/lib/redmine/pagination.rb
index e0629981c..a28236a28 100644
--- a/lib/redmine/pagination.rb
+++ b/lib/redmine/pagination.rb
@@ -116,16 +116,6 @@ module Redmine
#
def paginate(scope, options={})
options = options.dup
- finder_options = options.extract!(
- :conditions,
- :order,
- :joins,
- :include,
- :select
- )
- if scope.is_a?(Symbol) || finder_options.values.compact.any?
- return deprecated_paginate(scope, finder_options, options)
- end
paginator = paginator(scope.count, options)
collection = scope.limit(paginator.per_page).offset(paginator.offset).to_a
@@ -133,13 +123,6 @@ module Redmine
return paginator, collection
end
- def deprecated_paginate(arg, finder_options, options={})
- ActiveSupport::Deprecation.warn "#paginate with a Symbol and/or find options is depreceted and will be removed. Use a scope instead."
- klass = arg.is_a?(Symbol) ? arg.to_s.classify.constantize : arg
- scope = klass.scoped(finder_options)
- paginate(scope, options)
- end
-
def paginator(item_count, options={})
options.assert_valid_keys :parameter, :per_page