External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-09 05:29:26 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6177 from wwitzel3/devel

Browse Source 
add organization_id to Inventory summary fields
This commit is contained in:
Wayne Witzel III
2017-05-03 17:13:20 -04:00
committed by GitHub
parent a9c7822a4d 397f24f160
commit dfd65441b1
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/api/serializers.py
View File

@@ -73,7 +73,8 @@ SUMMARIZABLE_FK_FIELDS = {
'groups_with_active_failures', 'groups_with_active_failures',
'has_inventory_sources', 'has_inventory_sources',
'total_inventory_sources', 'total_inventory_sources',
'inventory_sources_with_failures'), 'inventory_sources_with_failures',
'organization_id'),
'host': DEFAULT_SUMMARY_FIELDS + ('has_active_failures', 'host': DEFAULT_SUMMARY_FIELDS + ('has_active_failures',
'has_inventory_sources'), 'has_inventory_sources'),
'group': DEFAULT_SUMMARY_FIELDS + ('has_active_failures', 'group': DEFAULT_SUMMARY_FIELDS + ('has_active_failures',
@@ -1592,8 +1593,6 @@ class InventorySourceSerializer(UnifiedJobTemplateSerializer, InventorySourceOpt
ret = super(InventorySourceSerializer, self).to_representation(obj) ret = super(InventorySourceSerializer, self).to_representation(obj)
if obj is None: if obj is None:
return ret return ret
if obj.inventory and obj.inventory.organization:
ret['organization'] = obj.inventory.organization.pk
if 'inventory' in ret and not obj.inventory: if 'inventory' in ret and not obj.inventory:
ret['inventory'] = None ret['inventory'] = None
return ret return ret