Re-order classes to dependencies are in place.

This commit is contained in:
jakedt 2014-03-14 17:37:57 -04:00
parent 83bc965556
commit 76e9b9681f

View file

@ -81,6 +81,24 @@ class RepositoryLogs(RepositoryParamResource):
return get_logs(namespace, start_time, end_time, repository=repo)
@resource('/v1/user/logs')
class UserLogs(ApiResource):
""" Resource for fetching logs for the current user. """
@nickname('listUserLogs')
@parse_args
@query_param('starttime', 'Earliest time from which to get logs. (%m/%d/%Y %Z)', type=str)
@query_param('endtime', 'Latest time to which to get logs. (%m/%d/%Y %Z)', type=str)
@query_param('performer', 'Username for which to filter logs.', type=str)
def get(self, args):
""" List the logs for the current user. """
performer_name = args['performer']
start_time = args['starttime']
end_time = args['endtime']
return get_logs(get_authenticated_user().username, start_time, end_time,
performer_name=performer_name)
@resource('/v1/organization/<orgname>/logs')
@related_user_resource(UserLogs)
class OrgLogs(ApiResource):
@ -100,22 +118,4 @@ class OrgLogs(ApiResource):
return get_logs(orgname, start_time, end_time, performer_name=performer_name)
abort(403)
@resource('/v1/user/logs')
class UserLogs(ApiResource):
""" Resource for fetching logs for the current user. """
@nickname('listUserLogs')
@parse_args
@query_param('starttime', 'Earliest time from which to get logs. (%m/%d/%Y %Z)', type=str)
@query_param('endtime', 'Latest time to which to get logs. (%m/%d/%Y %Z)', type=str)
@query_param('performer', 'Username for which to filter logs.', type=str)
def get(self, args):
""" List the logs for the current user. """
performer_name = args['performer']
start_time = args['starttime']
end_time = args['endtime']
return get_logs(get_authenticated_user().username, start_time, end_time,
performer_name=performer_name)
abort(403)