External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-13 12:27:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'improve_ujt_filter_aliases' into release_3.1.0

Browse Source 
* improve_ujt_filter_aliases:
  Alias unified job template search fields for presentation
This commit is contained in:
Matthew Jones
2017-02-22 16:59:56 -05:00
parent 1f0b3876cc b14336bdff
commit b43a354bca
3 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/api/filters.py
View File

@@ -112,7 +112,13 @@ class FieldLookupBackend(BaseFilterBackend):
elif name == 'pk': elif name == 'pk':
field = model._meta.pk field = model._meta.pk
else: else:
field = model._meta.get_field_by_name(name)[0] name_alt = name.replace("_", "")
if name_alt in model._meta.fields_map.keys():
field = model._meta.fields_map[name_alt]
new_parts.pop()
new_parts.append(name_alt)
else:
field = model._meta.get_field_by_name(name)[0]
if isinstance(field, ForeignObjectRel) and getattr(field.field, '__prevent_search__', False): if isinstance(field, ForeignObjectRel) and getattr(field.field, '__prevent_search__', False):
raise PermissionDenied(_('Filtering on %s is not allowed.' % name)) raise PermissionDenied(_('Filtering on %s is not allowed.' % name))
elif getattr(field, '__prevent_search__', False): elif getattr(field, '__prevent_search__', False):

5
awx/api/generics.py
View File

@@ -9,6 +9,7 @@ import time
# Django # Django
from django.conf import settings from django.conf import settings
from django.db import connection from django.db import connection
from django.db.models.fields import FieldDoesNotExist
from django.http import QueryDict from django.http import QueryDict
from django.shortcuts import get_object_or_404 from django.shortcuts import get_object_or_404
from django.template.loader import render_to_string from django.template.loader import render_to_string
@@ -291,7 +292,7 @@ class ListAPIView(generics.ListAPIView, GenericAPIView):
if getattr(field, 'related_model', None): if getattr(field, 'related_model', None):
fields.append('{}__search'.format(field.name)) fields.append('{}__search'.format(field.name))
for rel in self.model._meta.related_objects: for rel in self.model._meta.related_objects:
name = rel.get_accessor_name() name = rel.related_model._meta.verbose_name.replace(" ", "_")
if skip_related_name(name): if skip_related_name(name):
continue continue
fields.append('{}__search'.format(name)) fields.append('{}__search'.format(name))
@@ -314,6 +315,8 @@ class ListAPIView(generics.ListAPIView, GenericAPIView):
FieldLookupBackend().get_field_from_lookup(self.model, field) FieldLookupBackend().get_field_from_lookup(self.model, field)
except PermissionDenied: except PermissionDenied:
pass pass
except FieldDoesNotExist:
allowed_fields.append(field)
else: else:
allowed_fields.append(field) allowed_fields.append(field)
return allowed_fields return allowed_fields

11
awx/main/tests/functional/api/test_unified_job_template.py Normal file
View File

@@ -0,0 +1,11 @@
import pytest
from django.core.urlresolvers import reverse
@pytest.mark.django_db
def test_aliased_forward_reverse_field_searches(instance, options, get, admin):
url = reverse('api:unified_job_template_list')
response = options(url, None, admin)
assert 'job_template__search' in response.data['related_search_fields']
get(reverse("api:unified_job_template_list") + "?job_template__search=anything", user=admin, expect=200)