diff --git a/awx/ui/client/src/inventories/manage/copy/copy-groups-directive/copy-groups.directive.js b/awx/ui/client/src/inventories/manage/copy/copy-groups-directive/copy-groups.directive.js deleted file mode 100644 index f71cba7158..0000000000 --- a/awx/ui/client/src/inventories/manage/copy/copy-groups-directive/copy-groups.directive.js +++ /dev/null @@ -1,25 +0,0 @@ -/************************************************* - * Copyright (c) 2015 Ansible, Inc. - * - * All Rights Reserved - *************************************************/ - -/* jshint unused: vars */ -import copyGroupsDirectiveController from './copy-groups.directive.controller'; - -export default ['templateUrl', - function(templateUrl) { - return { - restrict: 'EA', - scope: true, - replace: true, - templateUrl: templateUrl('inventories/manage/copy/copy-groups-directive/copy-groups.directive'), - link: function(scope, element, attrs) { - - }, - controller: copyGroupsDirectiveController, - controllerAs: 'vm', - bindToController: true - }; - } -]; diff --git a/awx/ui/client/src/inventories/manage/copy/copy-groups-directive/copy-groups.directive.controller.js b/awx/ui/client/src/inventories/manage/copy/copy-groups.controller.js similarity index 98% rename from awx/ui/client/src/inventories/manage/copy/copy-groups-directive/copy-groups.directive.controller.js rename to awx/ui/client/src/inventories/manage/copy/copy-groups.controller.js index f0a1149726..480eb38b4e 100644 --- a/awx/ui/client/src/inventories/manage/copy/copy-groups-directive/copy-groups.directive.controller.js +++ b/awx/ui/client/src/inventories/manage/copy/copy-groups.controller.js @@ -1,4 +1,4 @@ -function copyGroupsDirectiveController($compile, $state, $scope, $location, Rest, ProcessErrors, CreateDialog, +function CopyGroupsCtrl($compile, $state, $scope, $location, Rest, ProcessErrors, CreateDialog, GetBasePath, Wait, GenerateList, GroupList, SearchInit, PaginateInit, GetRootGroups, ParamPass, Store) { var vm = this; var name; @@ -299,5 +299,5 @@ function copyGroupsDirectiveController($compile, $state, $scope, $location, Rest }; export default ['$compile', '$state', '$scope', '$location', 'Rest', 'ProcessErrors', 'CreateDialog', 'GetBasePath', 'Wait', 'generateList', 'GroupList', 'SearchInit', - 'PaginateInit', 'GetRootGroups', 'ParamPass', 'Store', copyGroupsDirectiveController + 'PaginateInit', 'GetRootGroups', 'ParamPass', 'Store', CopyGroupsCtrl ]; diff --git a/awx/ui/client/src/inventories/manage/copy/copy-groups-directive/copy-groups.directive.partial.html b/awx/ui/client/src/inventories/manage/copy/copy-groups.partial.html similarity index 100% rename from awx/ui/client/src/inventories/manage/copy/copy-groups-directive/copy-groups.directive.partial.html rename to awx/ui/client/src/inventories/manage/copy/copy-groups.partial.html diff --git a/awx/ui/client/src/inventories/manage/copy/copy-hosts-directive/copy-hosts.directive.js b/awx/ui/client/src/inventories/manage/copy/copy-hosts-directive/copy-hosts.directive.js deleted file mode 100644 index 794a932012..0000000000 --- a/awx/ui/client/src/inventories/manage/copy/copy-hosts-directive/copy-hosts.directive.js +++ /dev/null @@ -1,25 +0,0 @@ -/************************************************* - * Copyright (c) 2015 Ansible, Inc. - * - * All Rights Reserved - *************************************************/ - -/* jshint unused: vars */ -import copyHostsDirectiveController from './copy-hosts.directive.controller'; - -export default ['templateUrl', - function(templateUrl) { - return { - restrict: 'EA', - scope: true, - replace: true, - templateUrl: templateUrl('inventories/manage/copy/copy-hosts-directive/copy-hosts.directive'), - link: function(scope, element, attrs) { - - }, - controller: copyHostsDirectiveController, - controllerAs: 'vm', - bindToController: true - }; - } -]; diff --git a/awx/ui/client/src/inventories/manage/copy/copy-hosts-directive/copy-hosts.directive.controller.js b/awx/ui/client/src/inventories/manage/copy/copy-hosts.controller.js similarity index 96% rename from awx/ui/client/src/inventories/manage/copy/copy-hosts-directive/copy-hosts.directive.controller.js rename to awx/ui/client/src/inventories/manage/copy/copy-hosts.controller.js index 1da180f880..1102d934c8 100644 --- a/awx/ui/client/src/inventories/manage/copy/copy-hosts-directive/copy-hosts.directive.controller.js +++ b/awx/ui/client/src/inventories/manage/copy/copy-hosts.controller.js @@ -1,4 +1,4 @@ -function copyHostsDirectiveController($compile, $state, $scope, Rest, ProcessErrors, CreateDialog, GetBasePath, Wait, GenerateList, GroupList, SearchInit, PaginateInit, ParamPass, Store) { +function CopyHostsCtrl($compile, $state, $scope, Rest, ProcessErrors, CreateDialog, GetBasePath, Wait, GenerateList, GroupList, SearchInit, PaginateInit, ParamPass, Store) { var vm = this; var name; @@ -235,5 +235,5 @@ function copyHostsDirectiveController($compile, $state, $scope, Rest, ProcessErr } export default ['$compile', '$state', '$scope', 'Rest', 'ProcessErrors', 'CreateDialog', 'GetBasePath', 'Wait', 'generateList', 'GroupList', 'SearchInit', - 'PaginateInit', 'ParamPass', 'Store', copyHostsDirectiveController + 'PaginateInit', 'ParamPass', 'Store', CopyHostsCtrl ]; diff --git a/awx/ui/client/src/inventories/manage/copy/copy-hosts-directive/copy-hosts.directive.partial.html b/awx/ui/client/src/inventories/manage/copy/copy-hosts.partial.html similarity index 100% rename from awx/ui/client/src/inventories/manage/copy/copy-hosts-directive/copy-hosts.directive.partial.html rename to awx/ui/client/src/inventories/manage/copy/copy-hosts.partial.html diff --git a/awx/ui/client/src/inventories/manage/copy/copy.route.js b/awx/ui/client/src/inventories/manage/copy/copy.route.js index cd1f58d6cb..abd0e3a00e 100644 --- a/awx/ui/client/src/inventories/manage/copy/copy.route.js +++ b/awx/ui/client/src/inventories/manage/copy/copy.route.js @@ -8,6 +8,8 @@ import { } from '../../../shared/template-url/template-url.factory'; import inventoryManageCopyCtrl from './copy.controller'; +import CopyGroupsCtrl from './copy-groups.controller'; +import CopyHostsCtrl from './copy-hosts.controller'; export default { copy: { @@ -29,33 +31,29 @@ export default { copyGroup: { name: 'inventoryManage.copy.group', route: '/group/:group_id?groups', - template: '