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

Merge pull request #4201 from beeankha/helper_method_in_serializer

Browse Source 
Add Helper Method in Serializer for get_summary_fields

Reviewed-by: Yanis Guenane
             https://github.com/Spredzy
This commit is contained in:
softwarefactory-project-zuul[bot]
2019-07-10 14:28:04 +00:00
committed by GitHub
parent 557ec27303 12e0c31fe6
commit de02df4907
2 changed files with 21 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
awx/api/serializers.py
View File

@@ -4680,6 +4680,23 @@ class ActivityStreamSerializer(BaseSerializer):
obj._prefetched_objects_cache[related_manager.prefetch_cache_name] = list(related_manager.all()) obj._prefetched_objects_cache[related_manager.prefetch_cache_name] = list(related_manager.all())
return related_manager.all() return related_manager.all()
def _summarize_parent_ujt(self, obj, fk, summary_fields):
summary_keys = {'job': 'job_template',
'workflow_job_template_node': 'workflow_job_template',
'schedule': 'unified_job_template'}
if fk not in summary_keys:
return
related_obj = getattr(obj, summary_keys[fk], None)
summary_fields[get_type_for_model(related_obj)] = []
item = {}
fields = SUMMARIZABLE_FK_FIELDS[summary_keys[fk]]
if related_obj is not None:
for field in fields:
fval = getattr(related_obj, field, None)
if fval is not None:
item[field] = fval
summary_fields[get_type_for_model(related_obj)].append(item)
def get_summary_fields(self, obj): def get_summary_fields(self, obj):
summary_fields = OrderedDict() summary_fields = OrderedDict()
for fk, related_fields in self._local_summarizable_fk_fields: for fk, related_fields in self._local_summarizable_fk_fields:
@@ -4690,33 +4707,7 @@ class ActivityStreamSerializer(BaseSerializer):
if m2m_list: if m2m_list:
summary_fields[fk] = [] summary_fields[fk] = []
for thisItem in m2m_list: for thisItem in m2m_list:
if fk == 'job': self._summarize_parent_ujt(thisItem, fk, summary_fields)
summary_fields['job_template'] = []
job_template_item = {}
job_template_fields = SUMMARIZABLE_FK_FIELDS['job_template']
job_template = getattr(thisItem, 'job_template', None)
if job_template is not None:
for field in job_template_fields:
fval = getattr(job_template, field, None)
if fval is not None:
job_template_item[field] = fval
summary_fields['job_template'].append(job_template_item)
if fk == 'workflow_job_template_node':
summary_fields['workflow_job_template'] = []
workflow_job_template_item = {}
workflow_job_template_fields = SUMMARIZABLE_FK_FIELDS['workflow_job_template']
workflow_job_template = getattr(thisItem, 'workflow_job_template', None)
if workflow_job_template is not None:
for field in workflow_job_template_fields:
fval = getattr(workflow_job_template, field, None)
if fval is not None:
workflow_job_template_item[field] = fval
summary_fields['workflow_job_template'].append(workflow_job_template_item)
if fk == 'schedule':
unified_job_template = getattr(thisItem, 'unified_job_template', None)
if unified_job_template is not None:
summary_fields[get_type_for_model(unified_job_template)] = {'id': unified_job_template.id,
'name': unified_job_template.name}
thisItemDict = {} thisItemDict = {}
for field in related_fields: for field in related_fields:
fval = getattr(thisItem, field, None) fval = getattr(thisItem, field, None)

6
awx/ui/client/src/activity-stream/factories/build-anchor.factory.js
View File

@@ -39,13 +39,13 @@ export default function BuildAnchor($log, $filter) {
case 'schedule': case 'schedule':
// schedule urls depend on the resource they're associated with // schedule urls depend on the resource they're associated with
if (activity.summary_fields.job_template){ if (activity.summary_fields.job_template){
url += 'templates/job_template/' + activity.summary_fields.job_template.id + '/schedules/' + obj.id; url += 'templates/job_template/' + activity.summary_fields.job_template[0].id + '/schedules/' + obj.id;
} }
else if (activity.summary_fields.project){ else if (activity.summary_fields.project){
url += 'projects/' + activity.summary_fields.project.id + '/schedules/' + obj.id; url += 'projects/' + activity.summary_fields.project[0].id + '/schedules/' + obj.id;
} }
else if (activity.summary_fields.system_job_template){ else if (activity.summary_fields.system_job_template){
url += 'management_jobs/' + activity.summary_fields.system_job_template.id + '/schedules/edit/' + obj.id; url += 'management_jobs/management_jobs/' + activity.summary_fields.system_job_template[0].id + '/schedules/edit/' + obj.id;
} }
// urls for inventory sync schedules currently depend on having an inventory id and group id // urls for inventory sync schedules currently depend on having an inventory id and group id
else { else {