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

Expose the role's content_type field and reorder the objects in the UI

Browse Source 
when the resource was stored on ActivityStream as object1 instead of object2.

related #3841
This commit is contained in:
Jeff Bradberry
2019-05-10 14:13:37 -04:00
parent 0d3f1f4ac2
commit 250484339b
2 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/api/serializers.py
View File

@@ -128,7 +128,7 @@ SUMMARIZABLE_FK_FIELDS = {
'inventory_source': ('source', 'last_updated', 'status'),
'custom_inventory_script': DEFAULT_SUMMARY_FIELDS,
'source_script': ('name', 'description'),
'role': ('id', 'role_field'),
'role': ('id', 'role_field', 'content_type'),
'notification_template': DEFAULT_SUMMARY_FIELDS,
'instance_group': {'id', 'name', 'controller_id'},
'insights_credential': DEFAULT_SUMMARY_FIELDS,
@@ -5106,6 +5106,8 @@ class ActivityStreamSerializer(BaseSerializer):
for field in related_fields:
fval = getattr(thisItem, field, None)
if fval is not None:
if field == 'content_type':
fval = str(fval)
thisItemDict[field] = fval
summary_fields[fk].append(thisItemDict)
except ObjectDoesNotExist: