From 267653e50cfd28f0bf8cd5b1c38883065691e8a1 Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Wed, 25 Mar 2015 16:08:31 -0400 Subject: [PATCH] added smart status to scan job templates in the inventory properties page --- awx/ui/static/js/controllers/Inventories.js | 2 +- awx/ui/static/js/forms/Inventories.js | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/awx/ui/static/js/controllers/Inventories.js b/awx/ui/static/js/controllers/Inventories.js index b21fdd3bf7..4e1b44c0ff 100644 --- a/awx/ui/static/js/controllers/Inventories.js +++ b/awx/ui/static/js/controllers/Inventories.js @@ -791,7 +791,7 @@ export function InventoriesEdit($scope, $rootScope, $compile, $location, $log, $ .success(function () { $('#copy-job-modal').dialog('close'); Wait('stop'); - $location.path($location.path() + '/' + new_data.id); + $location.path($location.path() + '/job_templates/' + new_data.id); }) .error(function (data) { Wait('stop'); diff --git a/awx/ui/static/js/forms/Inventories.js b/awx/ui/static/js/forms/Inventories.js index b745ce7b00..3b628da008 100644 --- a/awx/ui/static/js/forms/Inventories.js +++ b/awx/ui/static/js/forms/Inventories.js @@ -114,14 +114,14 @@ export default }, fields: { - // smart_status: { - // label: 'Status', - // // columnClass: 'col-md-2 col-sm-2 col-xs-2', - // searchable: false, - // nosort: true, - // ngInclude: "'/static/partials/job-template-smart-status.html'", - // type: 'template' - // }, + smart_status: { + label: 'Status', + // columnClass: 'col-md-2 col-sm-2 col-xs-2', + searchable: false, + nosort: true, + ngInclude: "'/static/partials/scan-job-template-smart-status.html'", + type: 'template' + }, name: { key: true, label: 'Name',