This commit is contained in:
Mardanov Timur Rustemovich 2019-01-16 14:00:05 +03:00
parent 30cd430c27
commit 804a5f127e
2 changed files with 3 additions and 2 deletions

View File

@ -20,8 +20,9 @@ def make_qs(filters):
filters.pop(item[0])
filters[item[0].split("__")[0]] = item[1]
elif item[0].endswith('__has'):
filters.pop(item[0])
relationship_filters[item[0].split("__")[0]] = item[1]
for item in relationship_filters.items():
filters.pop(item[0]+'__has')
base_filters = reduce(lambda init, nx: init & Q(**{nx[0]: nx[1]}), filters.items(), Q())
return base_filters, relationship_filters

View File

@ -47,7 +47,7 @@ def convert_form_field_to_string(field):
@convert_form_field.register(forms.UUIDField)
@convert_form_field.register(RelationshipDefinition)
def convert_form_field_to_uuid(field):
return UUID(description=field.help_text)
return UUID()
@convert_form_field.register(IntegerProperty)