Fix bugs, mostly related to date formatting.
This commit is contained in:
parent
ddf5f2053c
commit
3542a520f5
11 changed files with 42 additions and 40 deletions
|
@ -4,7 +4,8 @@ from datetime import datetime, timedelta
|
|||
from flask.ext.restful import abort
|
||||
|
||||
from endpoints.api import (resource, nickname, ApiResource, query_param, parse_args,
|
||||
RepositoryParamResource, require_repo_admin, related_user_resource)
|
||||
RepositoryParamResource, require_repo_admin, related_user_resource,
|
||||
format_date)
|
||||
from auth.permissions import AdministerOrganizationPermission, AdministerOrganizationPermission
|
||||
from auth.auth_context import get_authenticated_user
|
||||
from data import model
|
||||
|
@ -15,7 +16,7 @@ def log_view(log):
|
|||
'kind': log.kind.name,
|
||||
'metadata': json.loads(log.metadata_json),
|
||||
'ip': log.ip,
|
||||
'datetime': log.datetime,
|
||||
'datetime': format_date(log.datetime),
|
||||
}
|
||||
|
||||
if log.performer:
|
||||
|
@ -56,8 +57,8 @@ def get_logs(namespace, start_time, end_time, performer_name=None,
|
|||
logs = model.list_logs(namespace, start_time, end_time, performer=performer,
|
||||
repository=repository)
|
||||
return {
|
||||
'start_time': start_time,
|
||||
'end_time': end_time,
|
||||
'start_time': format_date(start_time),
|
||||
'end_time': format_date(end_time),
|
||||
'logs': [log_view(log) for log in logs]
|
||||
}
|
||||
|
||||
|
|
Reference in a new issue