From bc1ed66a0b370c5b17f6e6a55d7adb9598f427ae Mon Sep 17 00:00:00 2001 From: Michael Abashian Date: Thu, 8 Jun 2017 14:00:24 -0400 Subject: [PATCH] Fixed edit host link on smart inventory host list --- .../inventories/related-hosts/list/host-list.controller.js | 4 ++-- .../src/inventories/related-hosts/related-host.list.js | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/awx/ui/client/src/inventories/related-hosts/list/host-list.controller.js b/awx/ui/client/src/inventories/related-hosts/list/host-list.controller.js index 3af8c0c6eb..f169faa6a8 100644 --- a/awx/ui/client/src/inventories/related-hosts/list/host-list.controller.js +++ b/awx/ui/client/src/inventories/related-hosts/list/host-list.controller.js @@ -83,8 +83,8 @@ export default ['$scope', 'ListDefinition', '$rootScope', 'GetBasePath', $scope.createHost = function(){ $state.go('inventories.edit.hosts.add'); }; - $scope.editHost = function(id){ - $state.go('inventories.edit.hosts.edit', {host_id: id}); + $scope.editHost = function(host){ + $state.go('inventories.edit.hosts.edit', {inventory_id: host.inventory_id, host_id: host.id}); }; $scope.goToInsights = function(id){ $state.go('inventories.edit.hosts.edit.insights', {host_id:id}); diff --git a/awx/ui/client/src/inventories/related-hosts/related-host.list.js b/awx/ui/client/src/inventories/related-hosts/related-host.list.js index 7e1e114bad..57aea9577b 100644 --- a/awx/ui/client/src/inventories/related-hosts/related-host.list.js +++ b/awx/ui/client/src/inventories/related-hosts/related-host.list.js @@ -38,7 +38,7 @@ export default { name: { key: true, label: 'Hosts', - ngClick: "editHost(host.id)", + ngClick: "editHost(host)", ngClass: "{ 'host-disabled-label': !host.enabled }", columnClass: 'col-lg-6 col-md-8 col-sm-8 col-xs-7', dataHostId: "{{ host.id }}", @@ -66,7 +66,7 @@ export default { }, edit: { //label: 'Edit', - ngClick: "editHost(host.id)", + ngClick: "editHost(host)", icon: 'icon-edit', awToolTip: 'Edit host', dataPlacement: 'top', @@ -74,7 +74,7 @@ export default { }, view: { //label: 'Edit', - ngClick: "editHost(host.id)", + ngClick: "editHost(host)", awToolTip: 'View host', dataPlacement: 'top', ngShow: '!host.summary_fields.user_capabilities.edit'