Fixed merge wonkiness, added back in groups query string to route

awx/ui/client/src/app.js

@@ -55,10 +55,10 @@ import {ProjectsList, ProjectsAdd, ProjectsEdit} from './controllers/Projects';
 import OrganizationsList from './organizations/list/organizations-list.controller';
 import OrganizationsAdd from './organizations/add/organizations-add.controller';
 import OrganizationsEdit from './organizations/edit/organizations-edit.controller';
-import InventoriesAdd from './inventory/inventory-add.controller';
+import InventoriesAdd from './inventories/add/inventory-add.controller';
-import InventoriesEdit from './inventory/inventory-edit.controller';
+import InventoriesEdit from './inventories/edit/inventory-edit.controller';
-import InventoriesList from './inventory/inventory-list.controller';
+import InventoriesList from './inventories/list/inventory-list.controller';
-import InventoriesManage from './inventory/inventory-manage.controller';
+import InventoriesManage from './inventories/manage/inventory-manage.controller';
 import {AdminsList} from './controllers/Admins';
 import {UsersList, UsersAdd, UsersEdit} from './controllers/Users';
 import {TeamsList, TeamsAdd, TeamsEdit} from './controllers/Teams';
@@ -373,69 +373,6 @@ var tower = angular.module('Tower', [
                 }
             }).
 
-            state('inventories', {
-                url: '/inventories',
-                templateUrl: urlPrefix + 'partials/inventories.html',
-                controller: InventoriesList,
-                data: {
-                    activityStream: true,
-                    activityStreamTarget: 'inventory'
-                },
-                ncyBreadcrumb: {
-                    label: "INVENTORIES"
-                },
-                resolve: {
-                    features: ['FeaturesService', function(FeaturesService) {
-                        return FeaturesService.get();
-                    }]
-                }
-            }).
-
-            state('inventories.add', {
-                url: '/add',
-                templateUrl: urlPrefix + 'partials/inventories.html',
-                controller: InventoriesAdd,
-                ncyBreadcrumb: {
-                    parent: "inventories",
-                    label: "CREATE INVENTORY"
-                },
-                resolve: {
-                    features: ['FeaturesService', function(FeaturesService) {
-                        return FeaturesService.get();
-                    }]
-                }
-            }).
-
-            state('inventories.edit', {
-                url: '/:inventory_id',
-                templateUrl: urlPrefix + 'partials/inventories.html',
-                controller: InventoriesEdit,
-                data: {
-                    activityStreamId: 'inventory_id'
-                },
-                resolve: {
-                    features: ['FeaturesService', function(FeaturesService) {
-                        return FeaturesService.get();
-                    }]
-                }
-            }).
-
-            state('inventoryManage', {
-                url: '/inventories/:inventory_id/manage?groups',
-                templateUrl: urlPrefix + 'partials/inventory-manage.html',
-                controller: InventoriesManage,
-                data: {
-                    activityStream: true,
-                    activityStreamTarget: 'inventory',
-                    activityStreamId: 'inventory_id'
-                },
-                resolve: {
-                    features: ['FeaturesService', function(FeaturesService) {
-                        return FeaturesService.get();
-                    }]
-                }
-            }).
-
             state('organizationAdmins', {
                 url: '/organizations/:organization_id/admins',
                 templateUrl: urlPrefix + 'partials/organizations.html',

awx/ui/client/src/inventories/manage/inventory-manage.route.js

@@ -9,7 +9,7 @@ import InventoriesManage from './inventory-manage.controller';
 
 export default {
     name: 'inventoryManage',
-    route: '/inventories/:inventory_id/manage',
+    url: '/inventories/:inventory_id/manage?groups',
     templateUrl: templateUrl('inventories/manage/inventory-manage'),
     controller: InventoriesManage,
     data: {