diff --git a/awx/ui/static/js/helpers/Schedules.js b/awx/ui/static/js/helpers/Schedules.js index 7b26869e04..c2bbc3cc75 100644 --- a/awx/ui/static/js/helpers/Schedules.js +++ b/awx/ui/static/js/helpers/Schedules.js @@ -521,6 +521,16 @@ angular.module('SchedulesHelper', ['Utilities', 'RestServices', 'SchedulesHelper itm.status = 'stopped'; itm.status_tip = 'Schedule is temporarily stopped. Click to activate.'; } + + // Copy summary_field values + for (field in list.fields) { + fld = list.fields[field]; + if (fld.sourceModel) { + if (itm.summary_fields[fld.sourceModel]) { + itm[field] = itm.summary_fields[fld.sourceModel][fld.sourceField]; + } + } + } // Set the item type label if (list.fields.type) { @@ -533,15 +543,6 @@ angular.module('SchedulesHelper', ['Utilities', 'RestServices', 'SchedulesHelper }); } - // Copy summary_field values - for (field in list.fields) { - fld = list.fields[field]; - if (fld.sourceModel) { - if (itm.summary_fields[fld.sourceModel]) { - itm[field] = itm.summary_fields[fld.sourceModel][fld.sourceField]; - } - } - } }); parent_scope.$emit('listLoaded'); }); diff --git a/awx/ui/static/js/lists/ScheduledJobs.js b/awx/ui/static/js/lists/ScheduledJobs.js index a37cf14525..2154b3b55f 100644 --- a/awx/ui/static/js/lists/ScheduledJobs.js +++ b/awx/ui/static/js/lists/ScheduledJobs.js @@ -42,8 +42,11 @@ angular.module('ScheduledJobsDefinition', []) label: 'Type', link: false, columnClass: "col-md-2 hidden-sm hidden-xs", + sourceModel: 'unified_job_template', + sourceField: 'type', ngBind: 'schedule.type_label', - searchable: false + searchable: false, + nosort: true }, name: { label: 'Name',