From 832e55f964aad654ff79fd235930463a3edc6301 Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Wed, 26 Apr 2017 12:24:17 -0700 Subject: [PATCH] Adjustments to nested groups edit after feedback from Bill. --- .../groups/nested-groups/nested-groups-list.controller.js | 3 +++ .../inventories/groups/nested-groups/nested-groups.form.js | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/awx/ui/client/src/inventories/groups/nested-groups/nested-groups-list.controller.js b/awx/ui/client/src/inventories/groups/nested-groups/nested-groups-list.controller.js index 471c38cb59..3a13d3b64c 100644 --- a/awx/ui/client/src/inventories/groups/nested-groups/nested-groups-list.controller.js +++ b/awx/ui/client/src/inventories/groups/nested-groups/nested-groups-list.controller.js @@ -69,6 +69,9 @@ $scope.editGroup = function(id){ $state.go('inventories.edit.groups.edit', {group_id: id}); }; + // $scope.editGroup = function(id){ + // $state.go('inventories.edit.groups.edit.nested_groups.edit', {nested_group_id: id}); + // }; $scope.deleteGroup = function(group){ $scope.toDelete = {}; angular.extend($scope.toDelete, group); diff --git a/awx/ui/client/src/inventories/groups/nested-groups/nested-groups.form.js b/awx/ui/client/src/inventories/groups/nested-groups/nested-groups.form.js index d39759bc25..955d25e462 100644 --- a/awx/ui/client/src/inventories/groups/nested-groups/nested-groups.form.js +++ b/awx/ui/client/src/inventories/groups/nested-groups/nested-groups.form.js @@ -19,13 +19,13 @@ function(i18n, nestedGroupListState){ name: 'nested_group', iterator: "nested_group", basePath: 'groups', - parent: 'inventories.edit.groups', + parent: 'inventories.edit.groups.edit.nested_groups', // the parent node this generated state definition tree expects to attach to stateTree: 'inventories', // form generator inspects the current state name to determine whether or not to set an active (.is-selected) class on a form tab // this setting is optional on most forms, except where the form's edit state name is not parentStateName.edit - activeEditState: 'inventories.edit.groups.edit', - detailsClick: "$state.go('inventories.edit.groups.edit')", + activeEditState: 'inventories.edit.groups.edit.nested_groups.edit', + detailsClick: "$state.go('inventories.edit.groups.edit.nested_groups.edit')", well: false, tabs: true, fields: {