diff --git a/awx/ui/client/src/inventories/main.js b/awx/ui/client/src/inventories/main.js index afade0c8a7..046f8bfd98 100644 --- a/awx/ui/client/src/inventories/main.js +++ b/awx/ui/client/src/inventories/main.js @@ -76,9 +76,9 @@ angular.module('inventory', [ function generateInventoryStates() { - let basicInventoryAdd = stateDefinitions.generateTree({ + let standardInventoryAdd = stateDefinitions.generateTree({ name: 'inventories.add', // top-most node in the generated tree (will replace this state definition) - url: '/standard_inventory/add', + url: '/inventory/add', modes: ['add'], form: 'InventoryForm', controllers: { @@ -86,9 +86,9 @@ angular.module('inventory', [ } }); - let basicInventoryEdit = stateDefinitions.generateTree({ + let standardInventoryEdit = stateDefinitions.generateTree({ name: 'inventories.edit', - url: '/standard_inventory/:inventory_id', + url: '/inventory/:inventory_id', modes: ['edit'], form: 'InventoryForm', controllers: { @@ -190,8 +190,8 @@ angular.module('inventory', [ smartInventoryAdhocCredential.name = 'inventories.editSmartInventory.adhoc.credential'; return Promise.all([ - basicInventoryAdd, - basicInventoryEdit, + standardInventoryAdd, + standardInventoryEdit, smartInventoryAdd, smartInventoryEdit ]).then((generated) => { diff --git a/awx/ui/client/src/inventories/standard/inventory.form.js b/awx/ui/client/src/inventories/standard/inventory.form.js index a49af35a00..08e3d8df48 100644 --- a/awx/ui/client/src/inventories/standard/inventory.form.js +++ b/awx/ui/client/src/inventories/standard/inventory.form.js @@ -31,7 +31,7 @@ function(i18n, InventoryCompletedJobsList) { return { - addTitle: i18n._('NEW STANDARD INVENTORY'), + addTitle: i18n._('NEW INVENTORY'), editTitle: '{{ inventory_name }}', name: 'inventory', basePath: 'inventory', diff --git a/awx/ui/client/src/job-results/job-results.controller.js b/awx/ui/client/src/job-results/job-results.controller.js index 973db9b6d8..04d7fd5210 100644 --- a/awx/ui/client/src/job-results/job-results.controller.js +++ b/awx/ui/client/src/job-results/job-results.controller.js @@ -60,7 +60,7 @@ function(jobData, jobDataOptions, jobLabels, jobFinished, count, $scope, ParseTy return '/#/inventories/smart_inventory/' + $scope.job.summary_fields.inventory.id; } else { - return '/#/inventories/standard_inventory/' + $scope.job.summary_fields.inventory.id; + return '/#/inventories/inventory/' + $scope.job.summary_fields.inventory.id; } } else { diff --git a/awx/ui/client/src/standard-out/standard-out.controller.js b/awx/ui/client/src/standard-out/standard-out.controller.js index 4206ffad15..debc8efcb0 100644 --- a/awx/ui/client/src/standard-out/standard-out.controller.js +++ b/awx/ui/client/src/standard-out/standard-out.controller.js @@ -56,7 +56,7 @@ export function JobStdoutController ($rootScope, $scope, $state, $stateParams, $scope.job_template_url = '/#/templates/' + data.unified_job_template; if($scope.inventory_name && data.inventory && data.summary_fields.inventory && data.summary_fields.inventory.kind) { if(data.summary_fields.inventory.kind === '') { - $scope.inventory_url = '/#/inventories/standard_inventory' + data.inventory; + $scope.inventory_url = '/#/inventories/inventory' + data.inventory; } else if(data.summary_fields.inventory.kind === 'smart') { $scope.inventory_url = '/#/inventories/smart_inventory' + data.inventory; diff --git a/awx/ui/tests/spec/job-results/job-results.controller-test.js b/awx/ui/tests/spec/job-results/job-results.controller-test.js index 971863577f..239c296b59 100644 --- a/awx/ui/tests/spec/job-results/job-results.controller-test.js +++ b/awx/ui/tests/spec/job-results/job-results.controller-test.js @@ -216,7 +216,7 @@ describe('Controller: jobResultsController', () => { it('should transform related links and set to scope var', () => { expect($scope.created_by_link).toBe('/#/users/12'); - expect($scope.inventory_link).toBe('/#/inventories/standard_inventory/12'); + expect($scope.inventory_link).toBe('/#/inventories/inventory/12'); expect($scope.project_link).toBe('/#/projects/12'); expect($scope.machine_credential_link).toBe('/#/credentials/12'); expect($scope.cloud_credential_link).toBe('/#/credentials/13');