mirror of
https://github.com/meineerde/redmine.git
synced 2025-12-23 08:51:13 +00:00
Removed deprecated pagination that no longer works.
git-svn-id: http://svn.redmine.org/redmine/trunk@15591 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
4bf74a536f
commit
040b90f483
@ -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
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user