From 7d692d08f9b8bdedbe960e538b6a6a164ae2208e Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Wed, 1 May 2019 16:15:00 -0400 Subject: [PATCH] include playbook as a default search field --- awx/api/filters.py | 2 +- awx/api/views/__init__.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/awx/api/filters.py b/awx/api/filters.py index 4aa2a8385d..68b55110d1 100644 --- a/awx/api/filters.py +++ b/awx/api/filters.py @@ -223,7 +223,7 @@ class FieldLookupBackend(BaseFilterBackend): raise ValueError('%s is not searchable' % new_lookup[:-8]) new_lookups = [] for rm_field in related_model._meta.fields: - if rm_field.name in ('username', 'first_name', 'last_name', 'email', 'name', 'description'): + if rm_field.name in ('username', 'first_name', 'last_name', 'email', 'name', 'description', 'playbook'): new_lookups.append('{}__{}__icontains'.format(new_lookup[:-8], rm_field.name)) return value, new_lookups else: diff --git a/awx/api/views/__init__.py b/awx/api/views/__init__.py index c0554440a9..e55eb00087 100644 --- a/awx/api/views/__init__.py +++ b/awx/api/views/__init__.py @@ -4170,12 +4170,14 @@ class UnifiedJobTemplateList(ListAPIView): model = models.UnifiedJobTemplate serializer_class = serializers.UnifiedJobTemplateSerializer + search_fields = ('description', 'name', 'jobtemplate__playbook',) class UnifiedJobList(ListAPIView): model = models.UnifiedJob serializer_class = serializers.UnifiedJobListSerializer + search_fields = ('description', 'name', 'job__playbook',) def redact_ansi(line):