From 9a7d77ffe382b7435a132786cf803b27fdc6c65a Mon Sep 17 00:00:00 2001 From: Chris Church Date: Thu, 3 Apr 2014 13:42:01 -0400 Subject: [PATCH] AC-1121 Renamed job_type to unified_job_type on summary fields for schedules. --- awx/api/serializers.py | 4 ++-- awx/ui/static/js/lists/ScheduledJobs.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/awx/api/serializers.py b/awx/api/serializers.py index 0a98c9839d..d505015502 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -72,7 +72,7 @@ SUMMARIZABLE_FK_FIELDS = { 'job': DEFAULT_SUMMARY_FIELDS + ('status', 'failed',), 'job_template': DEFAULT_SUMMARY_FIELDS, '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_host_summary': DEFAULT_SUMMARY_FIELDS + ('failed',), 'last_update': DEFAULT_SUMMARY_FIELDS + ('status', 'failed', 'license_error'), @@ -279,7 +279,7 @@ class BaseSerializer(serializers.ModelSerializer): if isinstance(fkval, PolymorphicModel): fkval = fkval.get_real_instance() 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() fval = get_type_for_model(fkval._get_unified_job_class()) if fval is not None: diff --git a/awx/ui/static/js/lists/ScheduledJobs.js b/awx/ui/static/js/lists/ScheduledJobs.js index 336036b4b9..59dea90486 100644 --- a/awx/ui/static/js/lists/ScheduledJobs.js +++ b/awx/ui/static/js/lists/ScheduledJobs.js @@ -44,7 +44,7 @@ angular.module('ScheduledJobsDefinition', []) noLink: true, columnClass: "col-md-2 hidden-sm hidden-xs", sourceModel: 'unified_job_template', - sourceField: 'job_type', + sourceField: 'unified_job_type', ngBind: 'schedule.type_label', searchable: false, nosort: true