Commit 26854cd7 by Oleg Marshev

Use own convert str.

parent a8aaab76
...@@ -10,7 +10,6 @@ from rest_framework.views import APIView ...@@ -10,7 +10,6 @@ from rest_framework.views import APIView
from rest_framework.decorators import api_view, permission_classes from rest_framework.decorators import api_view, permission_classes
from annotator.annotation import Annotation from annotator.annotation import Annotation
from annotator.atoi import atoi
CREATE_FILTER_FIELDS = ('updated', 'created', 'consumer', 'id') CREATE_FILTER_FIELDS = ('updated', 'created', 'consumer', 'id')
UPDATE_FILTER_FIELDS = ('updated', 'created', 'user', 'consumer') UPDATE_FILTER_FIELDS = ('updated', 'created', 'user', 'consumer')
...@@ -31,9 +30,9 @@ class AnnotationSearchView(APIView): ...@@ -31,9 +30,9 @@ class AnnotationSearchView(APIView):
params = request.QUERY_PARAMS.dict() params = request.QUERY_PARAMS.dict()
if 'offset' in params: if 'offset' in params:
kwargs['offset'] = atoi(params.pop('offset'), default=None) kwargs['offset'] = _convert_str(params.pop('offset'))
if 'limit' in params: if 'limit' in params:
kwargs['limit'] = atoi(params.pop('limit'), default=None) kwargs['limit'] = _convert_str(params.pop('limit'))
# All remaining parameters are considered searched fields. # All remaining parameters are considered searched fields.
kwargs['query'] = params kwargs['query'] = params
...@@ -135,13 +134,19 @@ class AnnotationDetailView(APIView): ...@@ -135,13 +134,19 @@ class AnnotationDetailView(APIView):
def _filter_input(annotation, fields): def _filter_input(annotation, fields):
"""
Pop given fields from annotation.
"""
for field in fields: for field in fields:
annotation.pop(field, None) annotation.pop(field, None)
return annotation return annotation
def _convert_str(value, default=0): def _convert_str(value, default=None):
"""
Convert given value to string.
"""
try: try:
return int(v or default) return int(value or default)
except ValueError: except ValueError:
return default return default
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment