zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-04-09 17:41:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix up how the pager view works and how we return errors from some views

Browse Source 
so that we can propogate non 200 statuses
This commit is contained in:
Matthew Jones
2014-07-16 12:29:36 -04:00
parent fe764c2114
commit 364e185412
2 changed files with 44 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
awx/api/utils/decorators.py
View File

@@ -7,6 +7,7 @@ import functools
from rest_framework.response import Response
from rest_framework.settings import api_settings
from rest_framework import status
def paginated(method):
"""Given an method with a Django REST Framework API method signature
@@ -46,29 +47,34 @@ def paginated(method):
kwargs['ordering'] = ordering
# Okay, call the underlying method.
results, count = method(self, request, *args, **kwargs)
results, count, stat = method(self, request, *args, **kwargs)
if stat is None:
stat = status.HTTP_200_OK
# Determine the next and previous pages, if any.
prev, next_ = None, None
if page > 1:
get_copy = copy.copy(request.GET)
get_copy['page'] = page - 1
prev = '%s?%s' % (request.path, get_copy.urlencode())
if count > offset + limit:
get_copy = copy.copy(request.GET)
get_copy['page'] = page + 1
next_ = '%s?%s' % (request.path, get_copy.urlencode())
if stat == status.HTTP_200_OK:
# Determine the next and previous pages, if any.
prev, next_ = None, None
if page > 1:
get_copy = copy.copy(request.GET)
get_copy['page'] = page - 1
prev = '%s?%s' % (request.path, get_copy.urlencode())
if count > offset + limit:
get_copy = copy.copy(request.GET)
get_copy['page'] = page + 1
next_ = '%s?%s' % (request.path, get_copy.urlencode())
# Compile the results into a dictionary with pagination
# information.
answer = collections.OrderedDict((
('count', count),
('next', next_),
('previous', prev),
('results', results),
))
# Compile the results into a dictionary with pagination
# information.
answer = collections.OrderedDict((
('count', count),
('next', next_),
('previous', prev),
('results', results),
))
else:
answer = results
# Okay, we're done; return response data.
return Response(answer)
return Response(answer, status=stat)
return func