From 4a2580f7edc87c05db0d915be8d2c8e54e2f4a9a Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Tue, 3 May 2016 14:24:48 -0700 Subject: [PATCH] Removing stale Admin.js from /controllers and /lists These were used for the /organizations/:id/admin route, which has been updated in 3.0. These files are no longer needed. --- awx/ui/client/src/app.js | 3 -- awx/ui/client/src/controllers/Admins.js | 46 ------------------------- awx/ui/client/src/lists/Admins.js | 37 -------------------- 3 files changed, 86 deletions(-) delete mode 100644 awx/ui/client/src/controllers/Admins.js delete mode 100644 awx/ui/client/src/lists/Admins.js diff --git a/awx/ui/client/src/app.js b/awx/ui/client/src/app.js index 020fcf5624..cd107a5590 100644 --- a/awx/ui/client/src/app.js +++ b/awx/ui/client/src/app.js @@ -55,7 +55,6 @@ import search from './search/main'; import {ProjectsList, ProjectsAdd, ProjectsEdit} from './controllers/Projects'; import OrganizationsList from './organizations/list/organizations-list.controller'; import OrganizationsAdd from './organizations/add/organizations-add.controller'; -import {AdminsList} from './controllers/Admins'; import {UsersList, UsersAdd, UsersEdit} from './controllers/Users'; import {TeamsList, TeamsAdd, TeamsEdit} from './controllers/Teams'; @@ -110,7 +109,6 @@ var tower = angular.module('Tower', [ JobTemplates.name, portalMode.name, search.name, - AdminsList.name, 'ngToast', 'templates', 'Utilities', @@ -127,7 +125,6 @@ var tower = angular.module('Tower', [ 'SearchHelper', 'PaginationHelpers', 'RefreshHelper', - 'AdminListDefinition', 'AWDirectives', 'InventoriesListDefinition', 'InventoryFormDefinition', diff --git a/awx/ui/client/src/controllers/Admins.js b/awx/ui/client/src/controllers/Admins.js deleted file mode 100644 index ffc298532f..0000000000 --- a/awx/ui/client/src/controllers/Admins.js +++ /dev/null @@ -1,46 +0,0 @@ -/************************************************* - * Copyright (c) 2015 Ansible, Inc. - * - * All Rights Reserved - *************************************************/ - - /** - * @ngdoc overview - * @name controllers - * @description These are all the controllers that are used throughout the application - * -*/ -/** - * @ngdoc function - * @name controllers.function:Admins - * @description This controller's for administrators - * Admins.js - * - * Controller functions for ading Admins to an Organization. - * -*/ - - -export function AdminsList($scope, $rootScope, $location, $log, $stateParams, Rest, Alert, AdminList, GenerateList, - Prompt, SearchInit, PaginateInit, ReturnToCaller, GetBasePath, SelectionInit) { - - var list = AdminList, - defaultUrl = GetBasePath('organizations') + $stateParams.organization_id + '/users/', - generator = GenerateList, - mode = 'select', - url = GetBasePath('organizations') + $stateParams.organization_id + '/admins/'; - - generator.inject(AdminList, { mode: mode, scope: $scope }); - - SelectionInit({ scope: $scope, list: list, url: url, returnToCaller: 1 }); - - SearchInit({ scope: $scope, set: 'admins', list: list, url: defaultUrl }); - - PaginateInit({ scope: $scope, list: list, url: defaultUrl }); - - $scope.search(list.iterator); -} - -AdminsList.$inject = ['$scope', '$rootScope', '$location', '$log', '$stateParams', 'Rest', 'Alert', 'AdminList', 'generateList', - 'Prompt', 'SearchInit', 'PaginateInit', 'ReturnToCaller', 'GetBasePath', 'SelectionInit' -]; diff --git a/awx/ui/client/src/lists/Admins.js b/awx/ui/client/src/lists/Admins.js deleted file mode 100644 index e1c49772f0..0000000000 --- a/awx/ui/client/src/lists/Admins.js +++ /dev/null @@ -1,37 +0,0 @@ -/************************************************* - * Copyright (c) 2015 Ansible, Inc. - * - * All Rights Reserved - *************************************************/ - -export default - angular.module('AdminListDefinition', []) - .value('AdminList', { - - name: 'admins', - iterator: 'admin', - selectTitle: 'Add Administrators', - editTitle: 'Admins', - selectInstructions: '

Select existing users by clicking each user or checking the related checkbox. When finished, click the blue ' + - 'Select button, located bottom right.

', - base: 'users', - index: false, - hover: true, - - fields: { - username: { - key: true, - label: 'Username' - }, - first_name: { - label: 'First Name' - }, - last_name: { - label: 'Last Name' - } - }, - - actions: {}, - - fieldActions: {} - });