]> source.dussan.org Git - redmine.git/commitdiff
Removed deprecated pagination that no longer works.
authorJean-Philippe Lang <jp_lang@yahoo.fr>
Thu, 30 Jun 2016 17:00:40 +0000 (17:00 +0000)
committerJean-Philippe Lang <jp_lang@yahoo.fr>
Thu, 30 Jun 2016 17:00:40 +0000 (17:00 +0000)
git-svn-id: http://svn.redmine.org/redmine/trunk@15591 e93f8b46-1217-0410-a6f0-8f06a7374b81

lib/redmine/pagination.rb

index e0629981c8ddbea82fcae90ac5fc283f56556fc2..a28236a2865d91556e902f9719072a054cb10934 100644 (file)
@@ -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