Add ID-based pagination to logs using new decorators and an encrypted token
Fixes #599
This commit is contained in:
parent
af77b92bcf
commit
bd0a098282
8 changed files with 110 additions and 36 deletions
|
@ -41,9 +41,7 @@ def get_aggregated_logs(start_time, end_time, performer=None, repository=None, n
|
|||
return query.group_by(date, LogEntry.kind)
|
||||
|
||||
|
||||
def list_logs(start_time, end_time, performer=None, repository=None, namespace=None, page=None,
|
||||
count=None):
|
||||
|
||||
def get_logs_query(start_time, end_time, performer=None, repository=None, namespace=None):
|
||||
Performer = User.alias()
|
||||
selections = [LogEntry, Performer]
|
||||
|
||||
|
@ -52,10 +50,7 @@ def list_logs(start_time, end_time, performer=None, repository=None, namespace=N
|
|||
.join(Performer, JOIN_LEFT_OUTER,
|
||||
on=(LogEntry.performer == Performer.id).alias('performer')))
|
||||
|
||||
if page and count:
|
||||
query = query.paginate(page, count)
|
||||
|
||||
return list(query.order_by(LogEntry.datetime.desc()))
|
||||
return query
|
||||
|
||||
|
||||
def log_action(kind_name, user_or_organization_name, performer=None, repository=None,
|
||||
|
|
Reference in a new issue