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

Merge pull request #5342 from AlanCoding/unified_jobs_rel_m2m

Browse Source 
fixes for unified_jobs related m2m search listing
This commit is contained in:
Alan Rominger
2017-02-15 09:30:17 -05:00
committed by GitHub
parent e8027bda44 c3eff539d0
commit b4b83e0248
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/api/generics.py
View File

@@ -282,13 +282,17 @@ class ListAPIView(generics.ListAPIView, GenericAPIView):
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.get_accessor_name()
if name is None:
continue
if name.endswith('_set'): if name.endswith('_set'):
continue continue
fields.append('{}__search'.format(name)) fields.append('{}__search'.format(name))
m2m_rel = [] m2m_rel = []
m2m_rel += self.model._meta.local_many_to_many m2m_rel += self.model._meta.local_many_to_many
if issubclass(self.model, UnifiedJobTemplate): if issubclass(self.model, UnifiedJobTemplate) and self.model != UnifiedJobTemplate:
m2m_rel += UnifiedJobTemplate._meta.local_many_to_many m2m_rel += UnifiedJobTemplate._meta.local_many_to_many
if issubclass(self.model, UnifiedJob) and self.model != UnifiedJob:
m2m_rel += UnifiedJob._meta.local_many_to_many
for relationship in m2m_rel: for relationship in m2m_rel:
if relationship.related_model._meta.app_label != 'main': if relationship.related_model._meta.app_label != 'main':
continue continue