Rename pagination args to pagination_opts

This commit is contained in:
richard-dds
2018-11-12 16:45:55 -05:00
parent 5b0383bde3
commit 4244ecf9b7
4 changed files with 15 additions and 13 deletions

View File

@@ -8,9 +8,9 @@ class AuditEventQuery(Query):
model = AuditEvent
@classmethod
def get_all(cls, pagination):
def get_all(cls, pagination_opts):
query = db.session.query(cls.model).order_by(cls.model.time_created.desc())
return cls.paginate(query, pagination)
return cls.paginate(query, pagination_opts)
class AuditLog(object):
@@ -29,11 +29,11 @@ class AuditLog(object):
return cls._log(resource=resource, action=action)
@classmethod
def get_all_events(cls, user, pagination=None):
def get_all_events(cls, user, pagination_opts=None):
Authorization.check_atat_permission(
user, Permissions.VIEW_AUDIT_LOG, "view audit log"
)
return AuditEventQuery.get_all(pagination)
return AuditEventQuery.get_all(pagination_opts)
@classmethod
def _resource_type(cls, resource):

View File

@@ -18,10 +18,12 @@ class Paginator(object):
self.query_set = query_set
@classmethod
def paginate(cls, query, pagination=None):
if pagination is not None:
def paginate(cls, query, pagination_opts=None):
if pagination_opts is not None:
return cls(
query.paginate(page=pagination["page"], per_page=pagination["per_page"])
query.paginate(
page=pagination_opts["page"], per_page=pagination_opts["per_page"]
)
)
else:
return query.all()
@@ -68,5 +70,5 @@ class Query(object):
return resource
@classmethod
def paginate(cls, query, pagination):
return Paginator.paginate(query, pagination)
def paginate(cls, query, pagination_opts):
return Paginator.paginate(query, pagination_opts)