Revision c3bcaeff
b/snf-cyclades-app/synnefo/plankton/backend.py | ||
---|---|---|
290 | 290 |
size_range = (None, None) |
291 | 291 |
for key, val in filters.items(): |
292 | 292 |
if key == 'size_min': |
293 |
size_range = (int(val), size_range[1])
|
|
293 |
size_range = (val, size_range[1])
|
|
294 | 294 |
elif key == 'size_max': |
295 |
size_range = (size_range[0], int(val))
|
|
295 |
size_range = (size_range[0], val)
|
|
296 | 296 |
else: |
297 | 297 |
keys.append('%s = %s' % (PLANKTON_PREFIX + key, val)) |
298 | 298 |
|
b/snf-cyclades-app/synnefo/plankton/views.py | ||
---|---|---|
38 | 38 |
from urllib import unquote |
39 | 39 |
|
40 | 40 |
from django.conf import settings |
41 |
from django.http import HttpResponse, HttpResponseNotFound
|
|
42 |
|
|
41 |
from django.http import (HttpResponse, HttpResponseNotFound,
|
|
42 |
HttpResponseBadRequest) |
|
43 | 43 |
from synnefo.plankton.util import plankton_method |
44 | 44 |
|
45 | 45 |
|
... | ... | |
253 | 253 |
assert params['sort_key'] in SORT_KEY_OPTIONS |
254 | 254 |
assert params['sort_dir'] in SORT_DIR_OPTIONS |
255 | 255 |
|
256 |
if 'size_max' in filters: |
|
257 |
try: |
|
258 |
filters['size_max'] = int(filters['size_max']) |
|
259 |
except ValueError: |
|
260 |
return HttpResponseBadRequest('400 Bad Request') |
|
261 |
|
|
262 |
if 'size_min' in filters: |
|
263 |
try: |
|
264 |
filters['size_min'] = int(filters['size_min']) |
|
265 |
except ValueError: |
|
266 |
return HttpResponseBadRequest('400 Bad Request') |
|
267 |
|
|
256 | 268 |
images = request.backend.list(filters, params) |
257 | 269 |
|
258 | 270 |
# Remove keys that should not be returned |
Also available in: Unified diff