From 540ad1ad471665d8b33306226ec2b194483f9f2c Mon Sep 17 00:00:00 2001 From: chouseknecht Date: Wed, 5 Jun 2013 09:57:05 -0400 Subject: [PATCH] Clicking host name on Inventory detail page now works correctly. Host is displayed in a modal dialog, allowing user to make changes and save. --- ansibleworks/ui/static/js/forms/Inventories.js | 2 +- ansibleworks/ui/static/js/helpers/Hosts.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ansibleworks/ui/static/js/forms/Inventories.js b/ansibleworks/ui/static/js/forms/Inventories.js index 536e09dd47..63325c4ce4 100644 --- a/ansibleworks/ui/static/js/forms/Inventories.js +++ b/ansibleworks/ui/static/js/forms/Inventories.js @@ -88,7 +88,7 @@ angular.module('InventoryFormDefinition', []) name: { key: true, label: 'Name', - linkTo: "/inventories/\{\{ inventory_id \}\}/hosts/\{\{ host.id \}\}" + ngClick: "editHost(\{\{ host.id \}\}, '\{\{ host.name \}\}')" }, description: { label: 'Description' diff --git a/ansibleworks/ui/static/js/helpers/Hosts.js b/ansibleworks/ui/static/js/helpers/Hosts.js index 364148dd8f..945c4d201a 100644 --- a/ansibleworks/ui/static/js/helpers/Hosts.js +++ b/ansibleworks/ui/static/js/helpers/Hosts.js @@ -413,7 +413,7 @@ angular.module('HostsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', 'H return function(params) { // Rerfresh the Hosts view on right side of page var url = (params.group_id !== null) ? GetBasePath('groups') + params.group_id + '/hosts/' : - GetBasePath('inventory') + params.inventory_id + '/'; + GetBasePath('inventory') + params.inventory_id + '/hosts/'; var relatedSets = { hosts: { url: url, iterator: 'host' } }; RelatedSearchInit({ scope: params.scope, form: InventoryForm, relatedSets: relatedSets }); RelatedPaginateInit({ scope: params.scope, relatedSets: relatedSets });