Merge pull request pallets-eco#1010 from tandreas/pagination

Abstract pagination to a different method for SQLA

flask_admin/contrib/sqla/view.py

@@ -884,6 +884,18 @@ def _apply_filters(self, query, count_query, joins, count_joins, filters):
 
  return query, count_query, joins, count_joins
 
+ def _apply_pagination(self, query, page, page_size):
+ if page_size is None:
+ page_size = self.page_size
+
+ if page_size:
+ query = query.limit(page_size)
+
+ if page and page_size:
+ query = query.offset(page * page_size)
+
+ return query
+
  def get_list(self, page, sort_column, sort_desc, search, filters,
  execute=True, page_size=None):
  """
@@ -948,14 +960,7 @@ def get_list(self, page, sort_column, sort_desc, search, filters,
  query, joins = self._apply_sorting(query, joins, sort_column, sort_desc)
 
  # Pagination
- if page_size is None:
- page_size = self.page_size
-
- if page_size:
- query = query.limit(page_size)
-
- if page and page_size:
- query = query.offset(page * page_size)
+ query = self._apply_pagination(query, page, page_size)
 
  # Execute if needed
  if execute: