zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-04-14 03:51:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

AC-1040 Fix inventory tree view.

Browse Source
This commit is contained in:
Chris Church
2014-03-25 14:20:37 -04:00
parent 6504a8ae40
commit 42e9451742
4 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/api/serializers.py
View File

@@ -72,7 +72,7 @@ SUMMARIZABLE_FK_FIELDS = {
'last_job_host_summary': DEFAULT_SUMMARY_FIELDS + ('failed',),
'last_update': DEFAULT_SUMMARY_FIELDS + ('status', 'failed', 'license_error'),
'current_update': DEFAULT_SUMMARY_FIELDS + ('status', 'failed', 'license_error'),
'inventory_source': ('source', 'last_updated', 'status'),
#'inventory_source': ('source', 'last_updated', 'status'),
}
class ChoiceField(fields.ChoiceField):
@@ -654,7 +654,8 @@ class GroupTreeSerializer(GroupSerializer):
if obj is None:
return {}
children_qs = obj.children.filter(active=True)
children_qs = children_qs.select_related('inventory', 'inventory_source')
children_qs = children_qs.select_related('inventory')
children_qs = children_qs.prefetch_related('inventory_source')
return GroupTreeSerializer(children_qs, many=True).data