External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-17 03:00:04 -03:30
Code Issues Packages Projects Releases Wiki Activity

adjusting how we restrict __in based on PR feedback

Browse Source
This commit is contained in:
Wayne Witzel III
2016-04-22 17:54:44 -04:00
parent 334f303a6f
commit b6b02bee99
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/api/filters.py
View File

@@ -131,9 +131,9 @@ class FieldLookupBackend(BaseFilterBackend):
value = to_python_boolean(value) value = to_python_boolean(value)
elif new_lookup.endswith('__in'): elif new_lookup.endswith('__in'):
items = [] items = []
if not value:
raise ValueError('cannot provide empty value for __in')
for item in value.split(','): for item in value.split(','):
if not item:
raise ValueError('cannot provide empty value for __in')
items.append(self.value_to_python_for_field(field, item)) items.append(self.value_to_python_for_field(field, item))
value = items value = items
elif new_lookup.endswith('__regex') or new_lookup.endswith('__iregex'): elif new_lookup.endswith('__regex') or new_lookup.endswith('__iregex'):

7
awx/main/tests/unit/api/test_filters.py
View File

@@ -3,10 +3,15 @@ import pytest
from awx.api.filters import FieldLookupBackend from awx.api.filters import FieldLookupBackend
from awx.main.models import JobTemplate from awx.main.models import JobTemplate
@pytest.mark.parametrize(u"empty_value", [u'', '', u'a,,b']) @pytest.mark.parametrize(u"empty_value", [u'', ''])
def test_empty_in(empty_value): def test_empty_in(empty_value):
field_lookup = FieldLookupBackend() field_lookup = FieldLookupBackend()
with pytest.raises(ValueError) as excinfo: with pytest.raises(ValueError) as excinfo:
field_lookup.value_to_python(JobTemplate, 'project__in', empty_value) field_lookup.value_to_python(JobTemplate, 'project__in', empty_value)
assert 'empty value for __in' in str(excinfo.value) assert 'empty value for __in' in str(excinfo.value)
@pytest.mark.parametrize(u"valid_value", [u'foo', u'foo,'])
def test_valid_in(valid_value):
field_lookup = FieldLookupBackend()
value, new_lookup = field_lookup.value_to_python(JobTemplate, 'project__in', valid_value)
assert 'foo' in value