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

AC-1121 Renamed job_type to unified_job_type on summary fields for schedules.

Browse Source
This commit is contained in:
Chris Church
2014-04-03 13:42:01 -04:00
parent 6fb16375a1
commit 9a7d77ffe3
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/api/serializers.py
View File

@@ -72,7 +72,7 @@ SUMMARIZABLE_FK_FIELDS = {
'job': DEFAULT_SUMMARY_FIELDS + ('status', 'failed',), 'job': DEFAULT_SUMMARY_FIELDS + ('status', 'failed',),
'job_template': DEFAULT_SUMMARY_FIELDS, 'job_template': DEFAULT_SUMMARY_FIELDS,
'schedule': DEFAULT_SUMMARY_FIELDS + ('next_run',), 'schedule': DEFAULT_SUMMARY_FIELDS + ('next_run',),
'unified_job_template': DEFAULT_SUMMARY_FIELDS + ('job_type',), 'unified_job_template': DEFAULT_SUMMARY_FIELDS + ('unified_job_type',),
'last_job': DEFAULT_SUMMARY_FIELDS + ('status', 'failed', 'license_error'), 'last_job': DEFAULT_SUMMARY_FIELDS + ('status', 'failed', 'license_error'),
'last_job_host_summary': DEFAULT_SUMMARY_FIELDS + ('failed',), 'last_job_host_summary': DEFAULT_SUMMARY_FIELDS + ('failed',),
'last_update': DEFAULT_SUMMARY_FIELDS + ('status', 'failed', 'license_error'), 'last_update': DEFAULT_SUMMARY_FIELDS + ('status', 'failed', 'license_error'),
@@ -279,7 +279,7 @@ class BaseSerializer(serializers.ModelSerializer):
if isinstance(fkval, PolymorphicModel): if isinstance(fkval, PolymorphicModel):
fkval = fkval.get_real_instance() fkval = fkval.get_real_instance()
fval = get_type_for_model(fkval) fval = get_type_for_model(fkval)
elif fval is None and field == 'job_type' and isinstance(fkval, UnifiedJobTemplate): elif fval is None and field == 'unified_job_type' and isinstance(fkval, UnifiedJobTemplate):
fkval = fkval.get_real_instance() fkval = fkval.get_real_instance()
fval = get_type_for_model(fkval._get_unified_job_class()) fval = get_type_for_model(fkval._get_unified_job_class())
if fval is not None: if fval is not None:

2
awx/ui/static/js/lists/ScheduledJobs.js
View File

@@ -44,7 +44,7 @@ angular.module('ScheduledJobsDefinition', [])
noLink: true, noLink: true,
columnClass: "col-md-2 hidden-sm hidden-xs", columnClass: "col-md-2 hidden-sm hidden-xs",
sourceModel: 'unified_job_template', sourceModel: 'unified_job_template',
sourceField: 'job_type', sourceField: 'unified_job_type',
ngBind: 'schedule.type_label', ngBind: 'schedule.type_label',
searchable: false, searchable: false,
nosort: true nosort: true