From c677503d8d1cc43aa733501550d31da494c12775 Mon Sep 17 00:00:00 2001 From: Chris Church Date: Tue, 25 Mar 2014 14:44:45 -0400 Subject: [PATCH] AC-1040 Fix filtering to work again with __regex suffix. --- awx/api/filters.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/awx/api/filters.py b/awx/api/filters.py index fbfd325b81..2e3e18fd4f 100644 --- a/awx/api/filters.py +++ b/awx/api/filters.py @@ -106,19 +106,18 @@ class FieldLookupBackend(BaseFilterBackend): def value_to_python(self, model, lookup, value): field, new_lookup = self.get_field_from_lookup(model, lookup) - if lookup.endswith('__isnull'): + if new_lookup.endswith('__isnull'): value = self.to_python_boolean(value) - elif lookup.endswith('__in'): + elif new_lookup.endswith('__in'): items = [] for item in value.split(','): items.append(self.value_to_python_for_field(field, item)) value = items - elif lookup.endswith('__regex') or lookup.endswith('__iregex'): + elif new_lookup.endswith('__regex') or new_lookup.endswith('__iregex'): try: re.compile(value) except re.error, e: raise ValueError(e.args[0]) - return value else: value = self.value_to_python_for_field(field, value) return value, new_lookup