meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-23 17:01:13 +00:00
Code Issues Releases Wiki Activity

Removed deprecated pagination that no longer works.

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@15591 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2016-06-30 17:00:40 +00:00
parent 4bf74a536f
commit 040b90f483
1 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/redmine/pagination.rb
View File

@ -116,16 +116,6 @@ module Redmine
# #
def paginate(scope, options={}) def paginate(scope, options={})
options = options.dup 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) paginator = paginator(scope.count, options)
collection = scope.limit(paginator.per_page).offset(paginator.offset).to_a collection = scope.limit(paginator.per_page).offset(paginator.offset).to_a
@ -133,13 +123,6 @@ module Redmine
return paginator, collection return paginator, collection
end 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={}) def paginator(item_count, options={})
options.assert_valid_keys :parameter, :per_page options.assert_valid_keys :parameter, :per_page