From 95240e03ab1f761bac24291652016aa8319b2a8a Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Tue, 5 Jan 2016 14:00:35 -0500 Subject: [PATCH] Removed old breadcrumb references --- awx/ui/client/src/adhoc/adhoc.controller.js | 20 ---- awx/ui/client/src/adhoc/adhoc.partial.html | 5 - awx/ui/client/src/app.js | 4 - awx/ui/client/src/controllers/Admins.js | 8 +- awx/ui/client/src/controllers/Credentials.js | 14 +-- awx/ui/client/src/controllers/Home.js | 16 ++-- awx/ui/client/src/controllers/Inventories.js | 92 +++---------------- awx/ui/client/src/controllers/JobDetail.js | 6 +- awx/ui/client/src/controllers/JobEvents.js | 20 +--- awx/ui/client/src/controllers/JobHosts.js | 15 +-- awx/ui/client/src/controllers/JobTemplates.js | 19 ++-- awx/ui/client/src/controllers/Jobs.js | 8 +- awx/ui/client/src/controllers/License.js | 2 +- .../client/src/controllers/Organizations.js | 19 ++-- awx/ui/client/src/controllers/Portal.js | 1 - awx/ui/client/src/controllers/Projects.js | 23 ++--- awx/ui/client/src/controllers/Schedules.js | 19 +--- awx/ui/client/src/controllers/Teams.js | 15 ++- awx/ui/client/src/controllers/Users.js | 20 ++-- awx/ui/client/src/helpers/Groups.js | 6 +- awx/ui/client/src/helpers/Hosts.js | 5 +- awx/ui/client/src/helpers/JobTemplates.js | 5 +- awx/ui/client/src/helpers/Jobs.js | 3 +- awx/ui/client/src/helpers/License.js | 2 +- awx/ui/client/src/helpers/Schedules.js | 1 - awx/ui/client/src/helpers/inventory.js | 1 - .../inventory-scripts/add/add.partial.html | 9 -- .../inventory-scripts/edit/edit.controller.js | 1 - .../inventory-scripts/edit/edit.partial.html | 6 -- .../inventory-scripts/list/list.partial.html | 5 - .../survey-maker/questions/edit.factory.js | 2 +- .../shared/question-definition.form.js | 1 - .../survey-maker/surveys/init.factory.js | 2 +- .../management-jobs/list/list.partial.html | 5 - .../schedule/schedule.partial.html | 6 -- awx/ui/client/src/partials/credentials.html | 15 --- .../client/src/partials/inventory-manage.html | 6 -- awx/ui/client/src/partials/job_detail.html | 9 -- awx/ui/client/src/partials/job_stdout.html | 9 +- .../client/src/partials/job_stdout_adhoc.html | 13 +-- awx/ui/client/src/partials/license.html | 5 - awx/ui/client/src/partials/organizations.html | 15 --- .../client/src/partials/schedule_detail.html | 6 +- awx/ui/client/src/partials/teams.html | 15 --- awx/ui/client/src/partials/users.html | 15 --- .../src/permissions/add/add.controller.js | 5 +- .../src/permissions/edit/edit.controller.js | 5 +- .../src/permissions/list/list.controller.js | 8 +- .../shared/team-permissions.partial.html | 15 --- .../shared/user-permissions.partial.html | 15 --- awx/ui/client/src/shared/Utilities.js | 84 ----------------- .../breadcrumbs/breadcrumb.directive.js | 32 ------- .../breadcrumbs/breadcrumbs.controller.js | 41 --------- .../breadcrumbs/breadcrumbs.directive.js | 41 --------- .../breadcrumbs/breadcrumbs.partial.html | 9 -- awx/ui/client/src/shared/breadcrumbs/main.js | 13 --- awx/ui/client/src/shared/form-generator.js | 69 +------------- awx/ui/client/src/shared/generator-helpers.js | 71 -------------- .../list-generator/list-generator.factory.js | 30 +----- .../system-tracking.partial.html | 10 -- awx/ui/client/src/widgets/Stream.js | 74 +-------------- 61 files changed, 113 insertions(+), 903 deletions(-) delete mode 100644 awx/ui/client/src/shared/breadcrumbs/breadcrumb.directive.js delete mode 100644 awx/ui/client/src/shared/breadcrumbs/breadcrumbs.controller.js delete mode 100644 awx/ui/client/src/shared/breadcrumbs/breadcrumbs.directive.js delete mode 100644 awx/ui/client/src/shared/breadcrumbs/breadcrumbs.partial.html delete mode 100644 awx/ui/client/src/shared/breadcrumbs/main.js diff --git a/awx/ui/client/src/adhoc/adhoc.controller.js b/awx/ui/client/src/adhoc/adhoc.controller.js index 14827600f9..24a289ebe9 100644 --- a/awx/ui/client/src/adhoc/adhoc.controller.js +++ b/awx/ui/client/src/adhoc/adhoc.controller.js @@ -72,23 +72,6 @@ function adhocController($q, $scope, $rootScope, $location, $stateParams, } }; - privateFn.getInventoryNameForBreadcrumbs = function(url) { - - Rest.setUrl(url); - var promise = Rest.get(); - promise.then(function (response) { - $scope.inv_name = response.data.name; - }); - promise.catch(function (response) { - ProcessErrors($rootScope, response.data, response.status, null, { - hdr: 'Error!', - msg: 'Failed to get inventory name. GET returned status: ' + - response.status }); - $location.path("/inventories/"); - }); - return promise; - }; - // set the arguments help to watch on change of the module privateFn.instantiateArgumentHelp = function() { $scope.$watch('module_name', function(val) { @@ -167,9 +150,6 @@ function adhocController($q, $scope, $rootScope, $location, $stateParams, // put the inventory id on scope for the partial to use $scope.inv_id = id; - // get the inventory name - privateFn.getInventoryNameForBreadcrumbs(urls.inventoryUrl); - // set the arguments help to watch on change of the module privateFn.instantiateArgumentHelp(); diff --git a/awx/ui/client/src/adhoc/adhoc.partial.html b/awx/ui/client/src/adhoc/adhoc.partial.html index b9fe95dbed..7420af3ea9 100644 --- a/awx/ui/client/src/adhoc/adhoc.partial.html +++ b/awx/ui/client/src/adhoc/adhoc.partial.html @@ -1,8 +1,3 @@ - - - - -
diff --git a/awx/ui/client/src/app.js b/awx/ui/client/src/app.js index 968cf37fb6..1c30bed4d7 100644 --- a/awx/ui/client/src/app.js +++ b/awx/ui/client/src/app.js @@ -31,8 +31,6 @@ import systemTracking from './system-tracking/main'; import inventoryScripts from './inventory-scripts/main'; import permissions from './permissions/main'; import managementJobs from './management-jobs/main'; -import breadcrumbs from './shared/breadcrumbs/main'; - // modules import setupMenu from './setup-menu/main'; @@ -81,7 +79,6 @@ var tower = angular.module('Tower', [ 'ngCookies', RestServices.name, browserData.name, - breadcrumbs.name, systemTracking.name, inventoryScripts.name, permissions.name, @@ -975,7 +972,6 @@ var tower = angular.module('Tower', [ $rootScope.removeConfigReady = $rootScope.$on('ConfigReady', function() { LoadBasePaths(); - $rootScope.breadcrumbs = []; $rootScope.crumbCache = []; if ($rootScope.removeOpenSocket) { diff --git a/awx/ui/client/src/controllers/Admins.js b/awx/ui/client/src/controllers/Admins.js index fe5ad2ecb3..ffc298532f 100644 --- a/awx/ui/client/src/controllers/Admins.js +++ b/awx/ui/client/src/controllers/Admins.js @@ -21,7 +21,7 @@ */ -export function AdminsList($scope, $rootScope, $location, $log, $stateParams, Rest, Alert, AdminList, GenerateList, LoadBreadCrumbs, +export function AdminsList($scope, $rootScope, $location, $log, $stateParams, Rest, Alert, AdminList, GenerateList, Prompt, SearchInit, PaginateInit, ReturnToCaller, GetBasePath, SelectionInit) { var list = AdminList, @@ -30,7 +30,7 @@ export function AdminsList($scope, $rootScope, $location, $log, $stateParams, Re mode = 'select', url = GetBasePath('organizations') + $stateParams.organization_id + '/admins/'; - generator.inject(AdminList, { mode: mode, scope: $scope, breadCrumbs: true }); + generator.inject(AdminList, { mode: mode, scope: $scope }); SelectionInit({ scope: $scope, list: list, url: url, returnToCaller: 1 }); @@ -39,10 +39,8 @@ export function AdminsList($scope, $rootScope, $location, $log, $stateParams, Re PaginateInit({ scope: $scope, list: list, url: defaultUrl }); $scope.search(list.iterator); - - LoadBreadCrumbs(); } AdminsList.$inject = ['$scope', '$rootScope', '$location', '$log', '$stateParams', 'Rest', 'Alert', 'AdminList', 'generateList', - 'LoadBreadCrumbs', 'Prompt', 'SearchInit', 'PaginateInit', 'ReturnToCaller', 'GetBasePath', 'SelectionInit' + 'Prompt', 'SearchInit', 'PaginateInit', 'ReturnToCaller', 'GetBasePath', 'SelectionInit' ]; diff --git a/awx/ui/client/src/controllers/Credentials.js b/awx/ui/client/src/controllers/Credentials.js index a371cab8ac..2dc3ba4109 100644 --- a/awx/ui/client/src/controllers/Credentials.js +++ b/awx/ui/client/src/controllers/Credentials.js @@ -12,7 +12,7 @@ export function CredentialsList($scope, $rootScope, $location, $log, $stateParams, Rest, Alert, CredentialList, - GenerateList, LoadBreadCrumbs, Prompt, SearchInit, PaginateInit, ReturnToCaller, + GenerateList, Prompt, SearchInit, PaginateInit, ReturnToCaller, ClearScope, ProcessErrors, GetBasePath, SelectionInit, GetChoices, Wait, Stream) { ClearScope(); @@ -26,7 +26,7 @@ export function CredentialsList($scope, $rootScope, $location, $log, $stateParam mode = (base === 'credentials') ? 'edit' : 'select', url; - view.inject(list, { mode: mode, scope: $scope, breadCrumbs:(($stateParams.user_id || $stateParams.team_id) ? true : false) }); + view.inject(list, { mode: mode, scope: $scope }); $scope.selected = []; $scope.credentialLoading = true; @@ -125,13 +125,13 @@ export function CredentialsList($scope, $rootScope, $location, $log, $stateParam } CredentialsList.$inject = ['$scope', '$rootScope', '$location', '$log', '$stateParams', 'Rest', 'Alert', 'CredentialList', 'generateList', - 'LoadBreadCrumbs', 'Prompt', 'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope', 'ProcessErrors', 'GetBasePath', + 'Prompt', 'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope', 'ProcessErrors', 'GetBasePath', 'SelectionInit', 'GetChoices', 'Wait', 'Stream' ]; export function CredentialsAdd($scope, $rootScope, $compile, $location, $log, $stateParams, CredentialForm, GenerateForm, Rest, Alert, - ProcessErrors, LoadBreadCrumbs, ReturnToCaller, ClearScope, GenerateList, SearchInit, PaginateInit, LookUpInit, UserList, TeamList, + ProcessErrors, ReturnToCaller, ClearScope, GenerateList, SearchInit, PaginateInit, LookUpInit, UserList, TeamList, GetBasePath, GetChoices, Empty, KindChange, OwnerChange, FormSave) { ClearScope(); @@ -294,13 +294,13 @@ export function CredentialsAdd($scope, $rootScope, $compile, $location, $log, $s } CredentialsAdd.$inject = ['$scope', '$rootScope', '$compile', '$location', '$log', '$stateParams', 'CredentialForm', 'GenerateForm', - 'Rest', 'Alert', 'ProcessErrors', 'LoadBreadCrumbs', 'ReturnToCaller', 'ClearScope', 'generateList', 'SearchInit', 'PaginateInit', + 'Rest', 'Alert', 'ProcessErrors', 'ReturnToCaller', 'ClearScope', 'generateList', 'SearchInit', 'PaginateInit', 'LookUpInit', 'UserList', 'TeamList', 'GetBasePath', 'GetChoices', 'Empty', 'KindChange', 'OwnerChange', 'FormSave' ]; export function CredentialsEdit($scope, $rootScope, $compile, $location, $log, $stateParams, CredentialForm, GenerateForm, Rest, Alert, - ProcessErrors, LoadBreadCrumbs, RelatedSearchInit, RelatedPaginateInit, ReturnToCaller, ClearScope, Prompt, GetBasePath, GetChoices, + ProcessErrors, RelatedSearchInit, RelatedPaginateInit, ReturnToCaller, ClearScope, Prompt, GetBasePath, GetChoices, KindChange, UserList, TeamList, LookUpInit, Empty, OwnerChange, FormSave, Stream, Wait) { ClearScope(); @@ -612,7 +612,7 @@ export function CredentialsEdit($scope, $rootScope, $compile, $location, $log, $ } CredentialsEdit.$inject = ['$scope', '$rootScope', '$compile', '$location', '$log', '$stateParams', 'CredentialForm', - 'GenerateForm', 'Rest', 'Alert', 'ProcessErrors', 'LoadBreadCrumbs', 'RelatedSearchInit', 'RelatedPaginateInit', + 'GenerateForm', 'Rest', 'Alert', 'ProcessErrors', 'RelatedSearchInit', 'RelatedPaginateInit', 'ReturnToCaller', 'ClearScope', 'Prompt', 'GetBasePath', 'GetChoices', 'KindChange', 'UserList', 'TeamList', 'LookUpInit', 'Empty', 'OwnerChange', 'FormSave', 'Stream', 'Wait' ]; diff --git a/awx/ui/client/src/controllers/Home.js b/awx/ui/client/src/controllers/Home.js index be28e5c75a..6dc921a1ab 100644 --- a/awx/ui/client/src/controllers/Home.js +++ b/awx/ui/client/src/controllers/Home.js @@ -156,7 +156,7 @@ Home.$inject = ['$scope', '$compile', '$stateParams', '$rootScope', '$location', * @description This controls the 'home/groups' page that is loaded from the dashboard * */ -export function HomeGroups($rootScope, $log, $scope, $filter, $compile, $location, $stateParams, LogViewer, HomeGroupList, GenerateList, ProcessErrors, LoadBreadCrumbs, ReturnToCaller, ClearScope, +export function HomeGroups($rootScope, $log, $scope, $filter, $compile, $location, $stateParams, LogViewer, HomeGroupList, GenerateList, ProcessErrors, ReturnToCaller, ClearScope, GetBasePath, SearchInit, PaginateInit, FormatDate, GetHostsStatusMsg, GetSyncStatusMsg, ViewUpdateStatus, Stream, GroupsEdit, Wait, Alert, Rest, Empty, InventoryUpdate, Find, GroupsCancelUpdate, Store) { @@ -170,7 +170,7 @@ export function HomeGroups($rootScope, $log, $scope, $filter, $compile, $locatio modal_scope = $scope.$new(), opt, PreviousSearchParams; - generator.inject(list, { mode: 'edit', scope: scope, breadCrumbs: true }); + generator.inject(list, { mode: 'edit', scope: scope }); function ellipsis(a) { if (a.length > 20) { @@ -334,8 +334,6 @@ export function HomeGroups($rootScope, $log, $scope, $filter, $compile, $locatio scope.$emit('WatchUpdateStatus'); // Start watching for live updates - LoadBreadCrumbs(); - if ($rootScope.removeJobStatusChange) { $rootScope.removeJobStatusChange(); } @@ -579,7 +577,7 @@ export function HomeGroups($rootScope, $log, $scope, $filter, $compile, $locatio } -HomeGroups.$inject = ['$rootScope', '$log', '$scope', '$filter', '$compile', '$location', '$stateParams', 'LogViewer', 'HomeGroupList', 'generateList', 'ProcessErrors', 'LoadBreadCrumbs', 'ReturnToCaller', +HomeGroups.$inject = ['$rootScope', '$log', '$scope', '$filter', '$compile', '$location', '$stateParams', 'LogViewer', 'HomeGroupList', 'generateList', 'ProcessErrors', 'ReturnToCaller', 'ClearScope', 'GetBasePath', 'SearchInit', 'PaginateInit', 'FormatDate', 'GetHostsStatusMsg', 'GetSyncStatusMsg', 'ViewUpdateStatus', 'Stream', 'GroupsEdit', 'Wait', 'Alert', 'Rest', 'Empty', 'InventoryUpdate', 'Find', 'GroupsCancelUpdate', 'Store', 'Socket' ]; @@ -592,7 +590,7 @@ HomeGroups.$inject = ['$rootScope', '$log', '$scope', '$filter', '$compile', '$l * */ -export function HomeHosts($scope, $location, $stateParams, HomeHostList, GenerateList, ProcessErrors, LoadBreadCrumbs, ReturnToCaller, ClearScope, +export function HomeHosts($scope, $location, $stateParams, HomeHostList, GenerateList, ProcessErrors, ReturnToCaller, ClearScope, GetBasePath, SearchInit, PaginateInit, FormatDate, SetStatus, ToggleHostEnabled, HostsEdit, Stream, Find, ShowJobSummary, ViewJob) { ClearScope('htmlTemplate'); //Garbage collection. Don't leave behind any listeners/watchers from the prior @@ -615,7 +613,7 @@ export function HomeHosts($scope, $location, $stateParams, HomeHostList, Generat }); } - generator.inject(list, { mode: 'edit', scope: $scope, breadCrumbs: true }); + generator.inject(list, { mode: 'edit', scope: $scope }); }); @@ -658,8 +656,6 @@ export function HomeHosts($scope, $location, $stateParams, HomeHostList, Generat $scope.search(list.iterator); - LoadBreadCrumbs(); - $scope.refreshHosts = function() { $scope.search(list.iterator); }; @@ -708,7 +704,7 @@ export function HomeHosts($scope, $location, $stateParams, HomeHostList, Generat } -HomeHosts.$inject = ['$scope', '$location', '$stateParams', 'HomeHostList', 'generateList', 'ProcessErrors', 'LoadBreadCrumbs', 'ReturnToCaller', +HomeHosts.$inject = ['$scope', '$location', '$stateParams', 'HomeHostList', 'generateList', 'ProcessErrors', 'ReturnToCaller', 'ClearScope', 'GetBasePath', 'SearchInit', 'PaginateInit', 'FormatDate', 'SetStatus', 'ToggleHostEnabled', 'HostsEdit', 'Stream', 'Find', 'ShowJobSummary', 'ViewJob' ]; diff --git a/awx/ui/client/src/controllers/Inventories.js b/awx/ui/client/src/controllers/Inventories.js index 4c9323f17b..c1171da9ce 100644 --- a/awx/ui/client/src/controllers/Inventories.js +++ b/awx/ui/client/src/controllers/Inventories.js @@ -14,7 +14,7 @@ import '../job-templates/main'; export function InventoriesList($scope, $rootScope, $location, $log, $stateParams, $compile, $filter, sanitizeFilter, Rest, Alert, InventoryList, generateList, - LoadBreadCrumbs, Prompt, SearchInit, PaginateInit, ReturnToCaller, + Prompt, SearchInit, PaginateInit, ReturnToCaller, ClearScope, ProcessErrors, GetBasePath, Wait, Stream, EditInventoryProperties, Find, Empty, LogViewer, $state) { @@ -123,8 +123,6 @@ export function InventoriesList($scope, $rootScope, $location, $log, $scope.search(list.iterator); - LoadBreadCrumbs(); - if ($scope.removePostRefresh) { $scope.removePostRefresh(); } @@ -370,13 +368,13 @@ export function InventoriesList($scope, $rootScope, $location, $log, } InventoriesList.$inject = ['$scope', '$rootScope', '$location', '$log', '$stateParams', '$compile', '$filter', 'sanitizeFilter', 'Rest', 'Alert', 'InventoryList', 'generateList', - 'LoadBreadCrumbs', 'Prompt', 'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope', 'ProcessErrors', + 'Prompt', 'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope', 'ProcessErrors', 'GetBasePath', 'Wait', 'Stream', 'EditInventoryProperties', 'Find', 'Empty', 'LogViewer', '$state' ]; export function InventoriesAdd($scope, $rootScope, $compile, $location, $log, $stateParams, InventoryForm, GenerateForm, Rest, - Alert, ProcessErrors, LoadBreadCrumbs, ReturnToCaller, ClearScope, generateList, OrganizationList, SearchInit, PaginateInit, + Alert, ProcessErrors, ReturnToCaller, ClearScope, generateList, OrganizationList, SearchInit, PaginateInit, LookUpInit, GetBasePath, ParseTypeChange, Wait, ToJSON) { ClearScope(); @@ -390,10 +388,9 @@ export function InventoriesAdd($scope, $rootScope, $compile, $location, $log, $s form.formLabelSize = null; form.formFieldSize = null; - generator.inject(form, { mode: 'add', related: false, scope: $scope, breadcrumbs: true }); + generator.inject(form, { mode: 'add', related: false, scope: $scope }); generator.reset(); - LoadBreadCrumbs(); $scope.parseType = 'yaml'; ParseTypeChange({ @@ -455,12 +452,12 @@ export function InventoriesAdd($scope, $rootScope, $compile, $location, $log, $s } InventoriesAdd.$inject = ['$scope', '$rootScope', '$compile', '$location', '$log', '$stateParams', 'InventoryForm', 'GenerateForm', - 'Rest', 'Alert', 'ProcessErrors', 'LoadBreadCrumbs', 'ReturnToCaller', 'ClearScope', 'generateList', 'OrganizationList', 'SearchInit', + 'Rest', 'Alert', 'ProcessErrors', 'ReturnToCaller', 'ClearScope', 'generateList', 'OrganizationList', 'SearchInit', 'PaginateInit', 'LookUpInit', 'GetBasePath', 'ParseTypeChange', 'Wait', 'ToJSON' ]; export function InventoriesEdit($scope, $rootScope, $compile, $location, $log, $stateParams, InventoryForm, GenerateForm, Rest, - Alert, ProcessErrors, LoadBreadCrumbs, ReturnToCaller, ClearScope, generateList, OrganizationList, SearchInit, PaginateInit, + Alert, ProcessErrors, ReturnToCaller, ClearScope, generateList, OrganizationList, SearchInit, PaginateInit, LookUpInit, GetBasePath, ParseTypeChange, Wait, ToJSON, ParseVariableString, Stream, RelatedSearchInit, RelatedPaginateInit, Prompt, PlaybookRun, CreateDialog, deleteJobTemplate) { @@ -479,7 +476,7 @@ export function InventoriesEdit($scope, $rootScope, $compile, $location, $log, $ form.formLabelSize = null; form.formFieldSize = null; $scope.inventory_id = inventory_id; - generator.inject(form, { mode: 'edit', related: true, scope: $scope, breadcrumbs: true }); + generator.inject(form, { mode: 'edit', related: true, scope: $scope }); generator.reset(); @@ -535,11 +532,6 @@ export function InventoriesEdit($scope, $rootScope, $compile, $location, $log, $ relatedSets: relatedSets }); - LoadBreadCrumbs({ - path: $location.path(), - title: $scope.inventory_name - }); - Wait('stop'); $scope.parseType = 'yaml'; ParseTypeChange({ @@ -786,7 +778,7 @@ export function InventoriesEdit($scope, $rootScope, $compile, $location, $log, $ } InventoriesEdit.$inject = ['$scope', '$rootScope', '$compile', '$location', '$log', '$stateParams', 'InventoryForm', 'GenerateForm', - 'Rest', 'Alert', 'ProcessErrors', 'LoadBreadCrumbs', 'ReturnToCaller', 'ClearScope', 'generateList', 'OrganizationList', 'SearchInit', + 'Rest', 'Alert', 'ProcessErrors', 'ReturnToCaller', 'ClearScope', 'generateList', 'OrganizationList', 'SearchInit', 'PaginateInit', 'LookUpInit', 'GetBasePath', 'ParseTypeChange', 'Wait', 'ToJSON', 'ParseVariableString', 'Stream', 'RelatedSearchInit', 'RelatedPaginateInit', 'Prompt', 'PlaybookRun', 'CreateDialog', 'deleteJobTemplate' ]; @@ -795,7 +787,7 @@ InventoriesEdit.$inject = ['$scope', '$rootScope', '$compile', '$location', '$lo export function InventoriesManage ($log, $scope, $rootScope, $location, $state, $compile, generateList, ClearScope, Empty, Wait, Rest, Alert, - LoadBreadCrumbs, GetBasePath, ProcessErrors, Breadcrumbs, InventoryGroups, + GetBasePath, ProcessErrors, InventoryGroups, InjectHosts, Find, HostsReload, SearchInit, PaginateInit, GetSyncStatusMsg, GetHostsStatusMsg, GroupsEdit, InventoryUpdate, GroupsCancelUpdate, ViewUpdateStatus, GroupsDelete, Store, HostsEdit, HostsDelete, @@ -809,18 +801,6 @@ export function InventoriesManage ($log, $scope, $rootScope, $location, ClearScope(); - $scope.group_breadcrumbs = [{ - name: '', - id: 0, - description: '', - show: true, - ngicon: null, - has_children: false, - related: {}, - active_class: 'active', - show_failures: false - }]; - // TODO: only display adhoc button if the user has permission to use it. // TODO: figure out how to get the action-list partial to update so that // the tooltip can be changed based off things being selected or not. @@ -944,22 +924,10 @@ export function InventoriesManage ($log, $scope, $rootScope, $location, $scope.removeInventoryLoaded = $scope.$on('InventoryLoaded', function() { var e, rows; - LoadBreadCrumbs({ - path: $location.path(), - title: '{{ inventory.name }}' - }); - $scope.group_breadcrumbs[0].name = $scope.inventory.name; - - // Build page breadcrumbs - e = angular.element(document.getElementById('breadcrumbs')); - e.html(Breadcrumbs({ list: InventoryGroups, mode: 'edit' })); - $compile(e)($scope); - // Add groups view generateList.inject(InventoryGroups, { mode: 'edit', id: 'group-list-container', - breadCrumbs: false, searchSize: 'col-lg-6 col-md-6 col-sm-6', scope: $scope }); @@ -1096,15 +1064,6 @@ export function InventoriesManage ($log, $scope, $rootScope, $location, $scope.search(InventoryGroups.iterator, null, true, false, true); } - function setActiveGroupBreadcrumb() { - $scope.group_breadcrumbs.forEach(function(crumb, idx) { - $scope.group_breadcrumbs[idx].active_class = ''; - }); - $scope.group_breadcrumbs[$scope.group_breadcrumbs.length - 1].active_class = 'active'; - $scope.refreshHostsOnGroupRefresh = true; - $scope.selected_group_id = ($scope.group_breadcrumbs[$scope.group_breadcrumbs.length - 1].id === 0) ? null : $scope.group_breadcrumbs[$scope.group_breadcrumbs.length - 1].id; - } - $scope.refreshHosts = function() { HostsReload({ scope: hostScope, @@ -1143,31 +1102,9 @@ export function InventoriesManage ($log, $scope, $rootScope, $location, groups.push(group.id); groups = groups.join(); $state.transitionTo('inventoryManage', {inventory_id: $state.params.inventory_id, groups: groups}, { notify: false }); - $scope.group_breadcrumbs.push(group); - setActiveGroupBreadcrumb(); loadGroups(group.related.children, group.id); }; - $scope.breadcrumbGroupSelect = function(id) { - var i, url; - $scope.group_breadcrumbs.every(function(crumb, idx) { - if (crumb.id === id) { - i = idx; - return false; - } - return true; - }); - $scope.group_breadcrumbs = $scope.group_breadcrumbs.slice(0,i + 1); - if (id > 0) { - url = $scope.group_breadcrumbs[$scope.group_breadcrumbs.length - 1].related.children; - } - else { - url = $scope.inventory.related.root_groups; - } - setActiveGroupBreadcrumb(); - loadGroups(url); - }; - $scope.createGroup = function () { PreviousSearchParams = Store('group_current_search_params'); GroupsEdit({ @@ -1314,13 +1251,6 @@ export function InventoriesManage ($log, $scope, $rootScope, $location, $scope.showGroupActivity = function () { var url, title, group; if ($scope.selected_group_id) { - $scope.group_breadcrumbs.every(function(crumb) { - if (crumb.id === $scope.selected_group_id) { - group = crumb; - return false; - } - return true; - }); url = GetBasePath('activity_stream') + '?group__id=' + $scope.selected_group_id; title = 'Showing all activities for group ' + group.name; } else { @@ -1412,8 +1342,8 @@ export function InventoriesManage ($log, $scope, $rootScope, $location, InventoriesManage.$inject = ['$log', '$scope', '$rootScope', '$location', '$state', '$compile', 'generateList', 'ClearScope', 'Empty', 'Wait', - 'Rest', 'Alert', 'LoadBreadCrumbs', 'GetBasePath', 'ProcessErrors', - 'Breadcrumbs', 'InventoryGroups', 'InjectHosts', 'Find', 'HostsReload', + 'Rest', 'Alert', 'GetBasePath', 'ProcessErrors', + 'InventoryGroups', 'InjectHosts', 'Find', 'HostsReload', 'SearchInit', 'PaginateInit', 'GetSyncStatusMsg', 'GetHostsStatusMsg', 'GroupsEdit', 'InventoryUpdate', 'GroupsCancelUpdate', 'ViewUpdateStatus', 'GroupsDelete', 'Store', 'HostsEdit', 'HostsDelete', diff --git a/awx/ui/client/src/controllers/JobDetail.js b/awx/ui/client/src/controllers/JobDetail.js index 4ff5ab4d48..af399872f4 100644 --- a/awx/ui/client/src/controllers/JobDetail.js +++ b/awx/ui/client/src/controllers/JobDetail.js @@ -11,7 +11,7 @@ */ -export function JobDetailController ($location, $rootScope, $filter, $scope, $compile, $stateParams, $log, ClearScope, Breadcrumbs, LoadBreadCrumbs, GetBasePath, Wait, Rest, +export function JobDetailController ($location, $rootScope, $filter, $scope, $compile, $stateParams, $log, ClearScope, GetBasePath, Wait, Rest, ProcessErrors, SelectPlay, SelectTask, Socket, GetElapsed, DrawGraph, LoadHostSummary, ReloadHostSummaryList, JobIsFinished, SetTaskStyles, DigestEvent, UpdateDOM, EventViewer, DeleteJob, PlaybookRun, HostEventsViewer, LoadPlays, LoadTasks, LoadHosts, HostsEdit, ParseVariableString, GetChoices, fieldChoices, fieldLabels, EditSchedule) { @@ -848,7 +848,7 @@ export function JobDetailController ($location, $rootScope, $filter, $scope, $co //$('#tasks-table-detail').mCustomScrollbar("update"); $('#hosts-table-detail').height(150); //$('#hosts-table-detail').mCustomScrollbar("update"); - height = $(window).height() - $('#main-menu-container .navbar').outerHeight() - $('#breadcrumb-container').outerHeight() - + height = $(window).height() - $('#main-menu-container .navbar').outerHeight() - $('#job-detail-container').outerHeight() - $('#job-detail-footer').outerHeight() - 20; if (height > 15) { // there's a bunch of white space at the bottom, let's use it @@ -1435,7 +1435,7 @@ export function JobDetailController ($location, $rootScope, $filter, $scope, $co }); } -JobDetailController.$inject = [ '$location', '$rootScope', '$filter', '$scope', '$compile', '$stateParams', '$log', 'ClearScope', 'Breadcrumbs', 'LoadBreadCrumbs', 'GetBasePath', +JobDetailController.$inject = [ '$location', '$rootScope', '$filter', '$scope', '$compile', '$stateParams', '$log', 'ClearScope', 'GetBasePath', 'Wait', 'Rest', 'ProcessErrors', 'SelectPlay', 'SelectTask', 'Socket', 'GetElapsed', 'DrawGraph', 'LoadHostSummary', 'ReloadHostSummaryList', 'JobIsFinished', 'SetTaskStyles', 'DigestEvent', 'UpdateDOM', 'EventViewer', 'DeleteJob', 'PlaybookRun', 'HostEventsViewer', 'LoadPlays', 'LoadTasks', 'LoadHosts', 'HostsEdit', 'ParseVariableString', 'GetChoices', 'fieldChoices', 'fieldLabels', 'EditSchedule' diff --git a/awx/ui/client/src/controllers/JobEvents.js b/awx/ui/client/src/controllers/JobEvents.js index ad4c7c09ab..bf547dd859 100644 --- a/awx/ui/client/src/controllers/JobEvents.js +++ b/awx/ui/client/src/controllers/JobEvents.js @@ -3,7 +3,7 @@ * * All Rights Reserved *************************************************/ - + /** * @ngdoc function * @name controllers.function:JobEvent @@ -12,7 +12,7 @@ export function JobEventsList($sce, $filter, $scope, $rootScope, $location, $log, $stateParams, Rest, Alert, JobEventList, GenerateList, - LoadBreadCrumbs, Prompt, SearchInit, PaginateInit, ReturnToCaller, ClearScope, ProcessErrors, GetBasePath, LookUpInit, ToggleChildren, + Prompt, SearchInit, PaginateInit, ReturnToCaller, ClearScope, ProcessErrors, GetBasePath, LookUpInit, ToggleChildren, FormatDate, EventView, Refresh, Wait) { ClearScope(); @@ -182,15 +182,6 @@ export function JobEventsList($sce, $filter, $scope, $rootScope, $location, $log .success(function (data) { $scope.job_status = data.status; $scope.job_name = data.summary_fields.job_template.name; - LoadBreadCrumbs({ - path: '/job_events/' + $scope.job_id, - title: $scope.job_id + ' - ' + data.summary_fields.job_template.name, - altPath: '/jobs' - }); - $rootScope.breadcrumbs = [{ - path: '/jobs', - title: $scope.job_id + ' - ' + data.summary_fields.job_template.name, - }]; $scope.$emit('SetHostLinks', data.inventory); }) .error(function (data, status) { @@ -253,12 +244,12 @@ export function JobEventsList($sce, $filter, $scope, $rootScope, $location, $log } JobEventsList.$inject = ['$sce', '$filter', '$scope', '$rootScope', '$location', '$log', '$stateParams', 'Rest', 'Alert', 'JobEventList', - 'generateList', 'LoadBreadCrumbs', 'Prompt', 'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope', 'ProcessErrors', + 'generateList', 'Prompt', 'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope', 'ProcessErrors', 'GetBasePath', 'LookUpInit', 'ToggleChildren', 'FormatDate', 'EventView', 'Refresh', 'Wait' ]; export function JobEventsEdit($scope, $rootScope, $compile, $location, $log, $stateParams, JobEventsForm, GenerateForm, - Rest, Alert, ProcessErrors, LoadBreadCrumbs, ClearScope, GetBasePath, FormatDate, EventView, Wait) { + Rest, Alert, ProcessErrors, ClearScope, GetBasePath, FormatDate, EventView, Wait) { ClearScope(); @@ -276,7 +267,6 @@ export function JobEventsEdit($scope, $rootScope, $compile, $location, $log, $st .success(function (data) { var cDate, fld, n, rows; $scope.event_display = data.event_display.replace(/^\u00a0*/g, ''); - LoadBreadCrumbs({ path: '/jobs/' + $stateParams.job_id + '/job_events/' + $stateParams.event_id, title: $scope.event_display }); for (fld in form.fields) { switch (fld) { case 'status': @@ -356,5 +346,5 @@ export function JobEventsEdit($scope, $rootScope, $compile, $location, $log, $st } JobEventsEdit.$inject = ['$scope', '$rootScope', '$compile', '$location', '$log', '$stateParams', 'JobEventsForm', 'GenerateForm', - 'Rest', 'Alert', 'ProcessErrors', 'LoadBreadCrumbs', 'ClearScope', 'GetBasePath', 'FormatDate', 'EventView', 'Wait' + 'Rest', 'Alert', 'ProcessErrors', 'ClearScope', 'GetBasePath', 'FormatDate', 'EventView', 'Wait' ]; diff --git a/awx/ui/client/src/controllers/JobHosts.js b/awx/ui/client/src/controllers/JobHosts.js index 59c7643c9d..cd6c0c65a4 100644 --- a/awx/ui/client/src/controllers/JobHosts.js +++ b/awx/ui/client/src/controllers/JobHosts.js @@ -3,7 +3,7 @@ * * All Rights Reserved *************************************************/ - + /** * @ngdoc function * @name controllers.function:JobHosts @@ -12,7 +12,7 @@ export function JobHostSummaryList($scope, $rootScope, $location, $log, $stateParams, Rest, Alert, JobHostList, GenerateList, - LoadBreadCrumbs, Prompt, SearchInit, PaginateInit, ReturnToCaller, ClearScope, ProcessErrors, GetBasePath, Refresh, + Prompt, SearchInit, PaginateInit, ReturnToCaller, ClearScope, ProcessErrors, GetBasePath, Refresh, JobStatusToolTip) { ClearScope(); @@ -84,15 +84,6 @@ export function JobHostSummaryList($scope, $rootScope, $location, $log, $statePa Rest.get() .success(function (data) { inventory = data.inventory; - LoadBreadCrumbs({ - path: '/job_host_summaries/' + $scope.job_id, - title: $scope.job_id + ' - ' + data.summary_fields.job_template.name, - altPath: '/jobs' - }); - $rootScope.breadcrumbs = [{ - path: '/jobs', - title: $scope.job_id + ' - ' + data.summary_fields.job_template.name, - }]; $scope.job_status = data.status; $scope.$emit('JobReady'); }) @@ -122,6 +113,6 @@ export function JobHostSummaryList($scope, $rootScope, $location, $log, $statePa } JobHostSummaryList.$inject = ['$scope', '$rootScope', '$location', '$log', '$stateParams', 'Rest', 'Alert', 'JobHostList', - 'generateList', 'LoadBreadCrumbs', 'Prompt', 'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope', 'ProcessErrors', + 'generateList', 'Prompt', 'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope', 'ProcessErrors', 'GetBasePath', 'Refresh', 'JobStatusToolTip', 'Wait' ]; diff --git a/awx/ui/client/src/controllers/JobTemplates.js b/awx/ui/client/src/controllers/JobTemplates.js index 1567413ebb..7deda071a1 100644 --- a/awx/ui/client/src/controllers/JobTemplates.js +++ b/awx/ui/client/src/controllers/JobTemplates.js @@ -12,7 +12,7 @@ export function JobTemplatesList($scope, $rootScope, $location, $log, $stateParams, Rest, Alert, JobTemplateList, - GenerateList, LoadBreadCrumbs, Prompt, SearchInit, PaginateInit, ReturnToCaller, ClearScope, ProcessErrors, + GenerateList, Prompt, SearchInit, PaginateInit, ReturnToCaller, ClearScope, ProcessErrors, GetBasePath, JobTemplateForm, CredentialList, LookUpInit, PlaybookRun, Wait, Stream, CreateDialog, $compile) { ClearScope(); @@ -56,8 +56,6 @@ export function JobTemplatesList($scope, $rootScope, $location, $log, $statePara $scope.search(list.iterator); - LoadBreadCrumbs(); - $scope.showActivity = function () { @@ -238,13 +236,13 @@ export function JobTemplatesList($scope, $rootScope, $location, $log, $statePara } JobTemplatesList.$inject = ['$scope', '$rootScope', '$location', '$log', '$stateParams', 'Rest', 'Alert', 'JobTemplateList', - 'generateList', 'LoadBreadCrumbs', 'Prompt', 'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope', + 'generateList', 'Prompt', 'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope', 'ProcessErrors', 'GetBasePath', 'JobTemplateForm', 'CredentialList', 'LookUpInit', 'PlaybookRun', 'Wait', 'Stream', 'CreateDialog' , '$compile' ]; export function JobTemplatesAdd($filter, $scope, $rootScope, $compile, $location, $log, $stateParams, JobTemplateForm, - GenerateForm, Rest, Alert, ProcessErrors, LoadBreadCrumbs, ReturnToCaller, ClearScope, GetBasePath, + GenerateForm, Rest, Alert, ProcessErrors, ReturnToCaller, ClearScope, GetBasePath, InventoryList, CredentialList, ProjectList, LookUpInit, md5Setup, ParseTypeChange, Wait, Empty, ToJSON, CallbackHelpInit, SurveyControllerInit, Prompt, GetChoices) { @@ -263,7 +261,7 @@ export function JobTemplatesAdd($filter, $scope, $rootScope, $compile, $location CallbackHelpInit({ scope: $scope }); $scope.can_edit = true; - generator.inject(form, { mode: 'add', related: false, scope: $scope, breadcrumbs: true }); + generator.inject(form, { mode: 'add', related: false, scope: $scope }); callback = function() { // Make sure the form controller knows there was a change @@ -277,7 +275,6 @@ export function JobTemplatesAdd($filter, $scope, $rootScope, $compile, $location $scope.allow_callbacks = false; generator.reset(); - LoadBreadCrumbs(); md5Setup({ scope: $scope, @@ -660,14 +657,14 @@ export function JobTemplatesAdd($filter, $scope, $rootScope, $compile, $location } JobTemplatesAdd.$inject = ['$filter', '$scope', '$rootScope', '$compile', '$location', '$log', '$stateParams', 'JobTemplateForm', - 'GenerateForm', 'Rest', 'Alert', 'ProcessErrors', 'LoadBreadCrumbs', 'ReturnToCaller', 'ClearScope', + 'GenerateForm', 'Rest', 'Alert', 'ProcessErrors', 'ReturnToCaller', 'ClearScope', 'GetBasePath', 'InventoryList', 'CredentialList', 'ProjectList', 'LookUpInit', 'md5Setup', 'ParseTypeChange', 'Wait', 'Empty', 'ToJSON', 'CallbackHelpInit', 'initSurvey', 'Prompt', 'GetChoices' ]; export function JobTemplatesEdit($filter, $scope, $rootScope, $compile, $location, $log, $stateParams, JobTemplateForm, GenerateForm, Rest, - Alert, ProcessErrors, LoadBreadCrumbs, RelatedSearchInit, RelatedPaginateInit, ReturnToCaller, ClearScope, InventoryList, + Alert, ProcessErrors, RelatedSearchInit, RelatedPaginateInit, ReturnToCaller, ClearScope, InventoryList, CredentialList, ProjectList, LookUpInit, GetBasePath, md5Setup, ParseTypeChange, JobStatusToolTip, FormatDate, Wait, Stream, Empty, Prompt, ParseVariableString, ToJSON, SchedulesControllerInit, JobsControllerInit, JobsListUpdate, GetChoices, SchedulesListInit, SchedulesList, CallbackHelpInit, PlaybookRun, SurveyControllerInit){ @@ -688,7 +685,7 @@ export function JobTemplatesEdit($filter, $scope, $rootScope, $compile, $locatio CallbackHelpInit({ scope: $scope }); SchedulesList.well = false; - generator.inject(form, { mode: 'edit', related: true, scope: $scope, breadcrumbs: true }); + generator.inject(form, { mode: 'edit', related: true, scope: $scope }); $scope.mode = 'edit'; $scope.parseType = 'yaml'; $scope.showJobType = false; @@ -1232,7 +1229,7 @@ export function JobTemplatesEdit($filter, $scope, $rootScope, $compile, $locatio } JobTemplatesEdit.$inject = ['$filter', '$scope', '$rootScope', '$compile', '$location', '$log', '$stateParams', 'JobTemplateForm', - 'GenerateForm', 'Rest', 'Alert', 'ProcessErrors', 'LoadBreadCrumbs', 'RelatedSearchInit', 'RelatedPaginateInit', + 'GenerateForm', 'Rest', 'Alert', 'ProcessErrors', 'RelatedSearchInit', 'RelatedPaginateInit', 'ReturnToCaller', 'ClearScope', 'InventoryList', 'CredentialList', 'ProjectList', 'LookUpInit', 'GetBasePath', 'md5Setup', 'ParseTypeChange', 'JobStatusToolTip', 'FormatDate', 'Wait', 'Stream', 'Empty', 'Prompt', 'ParseVariableString', 'ToJSON', 'SchedulesControllerInit', 'JobsControllerInit', 'JobsListUpdate', 'GetChoices', diff --git a/awx/ui/client/src/controllers/Jobs.js b/awx/ui/client/src/controllers/Jobs.js index 9407ceb901..e0b45e5c83 100644 --- a/awx/ui/client/src/controllers/Jobs.js +++ b/awx/ui/client/src/controllers/Jobs.js @@ -12,7 +12,7 @@ export function JobsListController ($rootScope, $log, $scope, $compile, $stateParams, - ClearScope, Breadcrumbs, LoadBreadCrumbs, LoadSchedulesScope, + ClearScope, LoadSchedulesScope, LoadJobsScope, AllJobsList, ScheduledJobsList, GetChoices, GetBasePath, Wait) { ClearScope(); @@ -23,10 +23,6 @@ export function JobsListController ($rootScope, $log, $scope, $compile, $statePa api_complete = false, max_rows; - LoadBreadCrumbs(); - - - if ($scope.removeListLoaded) { $scope.removeListLoaded(); } @@ -186,5 +182,5 @@ export function JobsListController ($rootScope, $log, $scope, $compile, $statePa } JobsListController.$inject = ['$rootScope', '$log', '$scope', '$compile', '$stateParams', -'ClearScope', 'Breadcrumbs', 'LoadBreadCrumbs', 'LoadSchedulesScope', 'LoadJobsScope', +'ClearScope', 'LoadSchedulesScope', 'LoadJobsScope', 'AllJobsList', 'ScheduledJobsList', 'GetChoices', 'GetBasePath', 'Wait']; diff --git a/awx/ui/client/src/controllers/License.js b/awx/ui/client/src/controllers/License.js index e44475ebb9..6bca4f5121 100644 --- a/awx/ui/client/src/controllers/License.js +++ b/awx/ui/client/src/controllers/License.js @@ -44,7 +44,7 @@ export function LicenseController(ClearScope, $location, $rootScope, $compile, $ delete self.form.fields.time_remaining; } - html = generator.buildHTML(self.form, { mode: 'edit', showButtons: false, breadCrumbs: false }); + html = generator.buildHTML(self.form, { mode: 'edit', showButtons: false }); return html; }; diff --git a/awx/ui/client/src/controllers/Organizations.js b/awx/ui/client/src/controllers/Organizations.js index 9bddadce5d..0031f60a56 100644 --- a/awx/ui/client/src/controllers/Organizations.js +++ b/awx/ui/client/src/controllers/Organizations.js @@ -3,7 +3,7 @@ * * All Rights Reserved *************************************************/ - + /** * @ngdoc function * @name controllers.function:Organizations @@ -11,7 +11,7 @@ */ -export function OrganizationsList($stateParams, $scope, $rootScope, $location, $log, Rest, Alert, LoadBreadCrumbs, Prompt, +export function OrganizationsList($stateParams, $scope, $rootScope, $location, $log, Rest, Alert, Prompt, GenerateList, OrganizationList, SearchInit, PaginateInit, ClearScope, ProcessErrors, GetBasePath, SelectionInit, Wait, Stream) { ClearScope(); @@ -23,9 +23,8 @@ export function OrganizationsList($stateParams, $scope, $rootScope, $location, $ defaultUrl = GetBasePath('organizations'), url; - generate.inject(OrganizationList, { mode: mode, scope: $scope, breadCrumbs:((mode === 'select') ? true : false) }); + generate.inject(OrganizationList, { mode: mode, scope: $scope }); $rootScope.flashMessage = null; - LoadBreadCrumbs(); if (mode === 'select') { url = GetBasePath('projects') + $stateParams.project_id + '/organizations/'; @@ -92,14 +91,14 @@ export function OrganizationsList($stateParams, $scope, $rootScope, $location, $ }; } -OrganizationsList.$inject = ['$stateParams', '$scope', '$rootScope', '$location', '$log', 'Rest', 'Alert', 'LoadBreadCrumbs', 'Prompt', +OrganizationsList.$inject = ['$stateParams', '$scope', '$rootScope', '$location', '$log', 'Rest', 'Alert', 'Prompt', 'generateList', 'OrganizationList', 'SearchInit', 'PaginateInit', 'ClearScope', 'ProcessErrors', 'GetBasePath', 'SelectionInit', 'Wait', 'Stream' ]; export function OrganizationsAdd($scope, $rootScope, $compile, $location, $log, $stateParams, OrganizationForm, - GenerateForm, Rest, Alert, ProcessErrors, LoadBreadCrumbs, ClearScope, GetBasePath, + GenerateForm, Rest, Alert, ProcessErrors, ClearScope, GetBasePath, ReturnToCaller, Wait) { ClearScope(); @@ -112,8 +111,6 @@ export function OrganizationsAdd($scope, $rootScope, $compile, $location, $log, generator.inject(form, { mode: 'add', related: false, scope: $scope}); generator.reset(); - LoadBreadCrumbs(); - // Save $scope.formSave = function () { generator.clearApiErrors(); @@ -145,12 +142,12 @@ export function OrganizationsAdd($scope, $rootScope, $compile, $location, $log, } OrganizationsAdd.$inject = ['$scope', '$rootScope', '$compile', '$location', '$log', '$stateParams', 'OrganizationForm', - 'GenerateForm', 'Rest', 'Alert', 'ProcessErrors', 'LoadBreadCrumbs', 'ClearScope', 'GetBasePath', 'ReturnToCaller', 'Wait' + 'GenerateForm', 'Rest', 'Alert', 'ProcessErrors', 'ClearScope', 'GetBasePath', 'ReturnToCaller', 'Wait' ]; export function OrganizationsEdit($scope, $rootScope, $compile, $location, $log, $stateParams, OrganizationForm, GenerateForm, Rest, - Alert, ProcessErrors, LoadBreadCrumbs, RelatedSearchInit, RelatedPaginateInit, Prompt, ClearScope, GetBasePath, Wait, Stream) { + Alert, ProcessErrors, RelatedSearchInit, RelatedPaginateInit, Prompt, ClearScope, GetBasePath, Wait, Stream) { ClearScope(); @@ -291,6 +288,6 @@ export function OrganizationsEdit($scope, $rootScope, $compile, $location, $log, } OrganizationsEdit.$inject = ['$scope', '$rootScope', '$compile', '$location', '$log', '$stateParams', 'OrganizationForm', 'GenerateForm', - 'Rest', 'Alert', 'ProcessErrors', 'LoadBreadCrumbs', 'RelatedSearchInit', 'RelatedPaginateInit', 'Prompt', 'ClearScope', 'GetBasePath', + 'Rest', 'Alert', 'ProcessErrors', 'RelatedSearchInit', 'RelatedPaginateInit', 'Prompt', 'ClearScope', 'GetBasePath', 'Wait', 'Stream' ]; diff --git a/awx/ui/client/src/controllers/Portal.js b/awx/ui/client/src/controllers/Portal.js index e2e059ca0c..9707e84676 100644 --- a/awx/ui/client/src/controllers/Portal.js +++ b/awx/ui/client/src/controllers/Portal.js @@ -39,7 +39,6 @@ export function PortalController($scope, $compile, $stateParams, $rootScope, $lo id : 'portal-job-templates', mode: 'edit', scope: $scope, - breadCrumbs: false, searchSize: 'col-lg-6 col-md-6' }); diff --git a/awx/ui/client/src/controllers/Projects.js b/awx/ui/client/src/controllers/Projects.js index 57ecd6c786..cdbdc7232b 100644 --- a/awx/ui/client/src/controllers/Projects.js +++ b/awx/ui/client/src/controllers/Projects.js @@ -12,7 +12,7 @@ export function ProjectsList ($scope, $rootScope, $location, $log, $stateParams, - Rest, Alert, ProjectList, GenerateList, LoadBreadCrumbs, Prompt, SearchInit, + Rest, Alert, ProjectList, GenerateList, Prompt, SearchInit, PaginateInit, ReturnToCaller, ClearScope, ProcessErrors, GetBasePath, SelectionInit, ProjectUpdate, Refresh, Wait, Stream, GetChoices, Empty, Find, LogViewer, GetProjectIcon, GetProjectToolTip, $filter, $state) { @@ -29,7 +29,7 @@ export function ProjectsList ($scope, $rootScope, $location, $log, $stateParams, url = (base === 'teams') ? GetBasePath('teams') + $stateParams.team_id + '/projects/' : defaultUrl, choiceCount = 0; - view.inject(list, { mode: mode, scope: $scope, breadCrumbs:(($stateParams.team_id) ? true : false)}); + view.inject(list, { mode: mode, scope: $scope }); $rootScope.flashMessage = null; $scope.projectLoading = true; @@ -192,8 +192,6 @@ export function ProjectsList ($scope, $rootScope, $location, $log, $stateParams, callback: 'choicesReadyProject' }); - LoadBreadCrumbs(); - $scope.showActivity = function () { Stream({ scope: $scope }); }; @@ -394,14 +392,14 @@ export function ProjectsList ($scope, $rootScope, $location, $log, $stateParams, } ProjectsList.$inject = ['$scope', '$rootScope', '$location', '$log', '$stateParams', 'Rest', 'Alert', 'ProjectList', 'generateList', - 'LoadBreadCrumbs', 'Prompt', 'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope', 'ProcessErrors', 'GetBasePath', + 'Prompt', 'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope', 'ProcessErrors', 'GetBasePath', 'SelectionInit', 'ProjectUpdate', 'Refresh', 'Wait', 'Stream', 'GetChoices', 'Empty', 'Find', 'LogViewer', 'GetProjectIcon', 'GetProjectToolTip', '$filter', '$state' ]; export function ProjectsAdd($scope, $rootScope, $compile, $location, $log, $stateParams, ProjectsForm, GenerateForm, Rest, Alert, ProcessErrors, - LoadBreadCrumbs, ClearScope, GetBasePath, ReturnToCaller, GetProjectPath, LookUpInit, OrganizationList, + ClearScope, GetBasePath, ReturnToCaller, GetProjectPath, LookUpInit, OrganizationList, CredentialList, GetChoices, DebugForm, Wait) { ClearScope(); @@ -413,9 +411,8 @@ export function ProjectsAdd($scope, $rootScope, $compile, $location, $log, $stat defaultUrl = GetBasePath('projects'), master = {}; - generator.inject(form, { mode: 'add', related: false, scope: $scope, breadcrumbs: true }); + generator.inject(form, { mode: 'add', related: false, scope: $scope }); generator.reset(); - LoadBreadCrumbs(); GetProjectPath({ scope: $scope, master: master }); @@ -540,14 +537,14 @@ export function ProjectsAdd($scope, $rootScope, $compile, $location, $log, $stat } ProjectsAdd.$inject = ['$scope', '$rootScope', '$compile', '$location', '$log', '$stateParams', 'ProjectsForm', - 'GenerateForm', 'Rest', 'Alert', 'ProcessErrors', 'LoadBreadCrumbs', 'ClearScope', 'GetBasePath', + 'GenerateForm', 'Rest', 'Alert', 'ProcessErrors', 'ClearScope', 'GetBasePath', 'ReturnToCaller', 'GetProjectPath', 'LookUpInit', 'OrganizationList', 'CredentialList', 'GetChoices', 'DebugForm', 'Wait' ]; export function ProjectsEdit($scope, $rootScope, $compile, $location, $log, $stateParams, ProjectsForm, - GenerateForm, Rest, Alert, ProcessErrors, LoadBreadCrumbs, RelatedSearchInit, RelatedPaginateInit, Prompt, + GenerateForm, Rest, Alert, ProcessErrors, RelatedSearchInit, RelatedPaginateInit, Prompt, ClearScope, GetBasePath, ReturnToCaller, GetProjectPath, Authorization, CredentialList, LookUpInit, GetChoices, Empty, DebugForm, Wait, Stream, SchedulesControllerInit, SchedulesListInit, SchedulesList, ProjectUpdate) { @@ -566,8 +563,7 @@ export function ProjectsEdit($scope, $rootScope, $compile, $location, $log, $sta generator.inject(form, { mode: 'edit', related: true, - scope: $scope, - breadcrumbs: true + scope: $scope }); generator.reset(); @@ -645,7 +641,6 @@ export function ProjectsEdit($scope, $rootScope, $compile, $location, $log, $sta Rest.get({ params: { id: id } }) .success(function (data) { var fld, i; - LoadBreadCrumbs({ path: '/projects/' + id, title: data.name }); for (fld in form.fields) { if (form.fields[fld].type === 'checkbox_group') { for (i = 0; i < form.fields[fld].fields.length; i++) { @@ -846,7 +841,7 @@ export function ProjectsEdit($scope, $rootScope, $compile, $location, $log, $sta } ProjectsEdit.$inject = ['$scope', '$rootScope', '$compile', '$location', '$log', '$stateParams', 'ProjectsForm', 'GenerateForm', - 'Rest', 'Alert', 'ProcessErrors', 'LoadBreadCrumbs', 'RelatedSearchInit', 'RelatedPaginateInit', 'Prompt', 'ClearScope', + 'Rest', 'Alert', 'ProcessErrors', 'RelatedSearchInit', 'RelatedPaginateInit', 'Prompt', 'ClearScope', 'GetBasePath', 'ReturnToCaller', 'GetProjectPath', 'Authorization', 'CredentialList', 'LookUpInit', 'GetChoices', 'Empty', 'DebugForm', 'Wait', 'Stream', 'SchedulesControllerInit', 'SchedulesListInit', 'SchedulesList', 'ProjectUpdate' ]; diff --git a/awx/ui/client/src/controllers/Schedules.js b/awx/ui/client/src/controllers/Schedules.js index b553ad114e..3fbff0d3ee 100644 --- a/awx/ui/client/src/controllers/Schedules.js +++ b/awx/ui/client/src/controllers/Schedules.js @@ -3,7 +3,7 @@ * * All Rights Reserved *************************************************/ - + /** * @ngdoc function * @name controllers.function:Schedules @@ -11,8 +11,8 @@ */ -export function ScheduleEditController($scope, $compile, $location, $stateParams, SchedulesList, Rest, ProcessErrors, LoadBreadCrumbs, ReturnToCaller, ClearScope, -GetBasePath, Wait, Breadcrumbs, Find, LoadDialogPartial, LoadSchedulesScope, GetChoices, Stream) { +export function ScheduleEditController($scope, $compile, $location, $stateParams, SchedulesList, Rest, ProcessErrors, ReturnToCaller, ClearScope, +GetBasePath, Wait, Find, LoadDialogPartial, LoadSchedulesScope, GetChoices, Stream) { ClearScope(); @@ -34,15 +34,6 @@ GetBasePath, Wait, Breadcrumbs, Find, LoadDialogPartial, LoadSchedulesScope, Get $scope.removeParentLoaded(); } $scope.removeParentLoaded = $scope.$on('ParentLoaded', function() { - // Add breadcrumbs - LoadBreadCrumbs({ - path: $location.path().replace(/\/schedules$/,''), - title: parentObject.name - }); - e = angular.element(document.getElementById('breadcrumbs')); - e.html(Breadcrumbs({ list: SchedulesList, mode: 'edit' })); - $compile(e)($scope); - url += "schedules/"; SchedulesList.well = true; LoadSchedulesScope({ @@ -94,5 +85,5 @@ GetBasePath, Wait, Breadcrumbs, Find, LoadDialogPartial, LoadSchedulesScope, Get }); } -ScheduleEditController.$inject = [ '$scope', '$compile', '$location', '$stateParams', 'SchedulesList', 'Rest', 'ProcessErrors', 'LoadBreadCrumbs', 'ReturnToCaller', 'ClearScope', - 'GetBasePath', 'Wait', 'Breadcrumbs', 'Find', 'LoadDialogPartial', 'LoadSchedulesScope', 'GetChoices', 'Stream' ]; +ScheduleEditController.$inject = [ '$scope', '$compile', '$location', '$stateParams', 'SchedulesList', 'Rest', 'ProcessErrors', 'ReturnToCaller', 'ClearScope', + 'GetBasePath', 'Wait', 'Find', 'LoadDialogPartial', 'LoadSchedulesScope', 'GetChoices', 'Stream' ]; diff --git a/awx/ui/client/src/controllers/Teams.js b/awx/ui/client/src/controllers/Teams.js index 1de7ba61aa..d54bf1be74 100644 --- a/awx/ui/client/src/controllers/Teams.js +++ b/awx/ui/client/src/controllers/Teams.js @@ -11,7 +11,7 @@ */ -export function TeamsList($scope, $rootScope, $location, $log, $stateParams, Rest, Alert, TeamList, GenerateList, LoadBreadCrumbs, +export function TeamsList($scope, $rootScope, $location, $log, $stateParams, Rest, Alert, TeamList, GenerateList, Prompt, SearchInit, PaginateInit, ReturnToCaller, ClearScope, ProcessErrors, SetTeamListeners, GetBasePath, SelectionInit, Wait, Stream) { @@ -63,8 +63,6 @@ export function TeamsList($scope, $rootScope, $location, $log, $stateParams, Res }); $scope.search(list.iterator); - LoadBreadCrumbs(); - $scope.showActivity = function () { Stream({ scope: $scope }); }; @@ -108,13 +106,13 @@ export function TeamsList($scope, $rootScope, $location, $log, $stateParams, Res } TeamsList.$inject = ['$scope', '$rootScope', '$location', '$log', '$stateParams', 'Rest', 'Alert', 'TeamList', 'generateList', - 'LoadBreadCrumbs', 'Prompt', 'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope', 'ProcessErrors', + 'Prompt', 'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope', 'ProcessErrors', 'SetTeamListeners', 'GetBasePath', 'SelectionInit', 'Wait', 'Stream' ]; export function TeamsAdd($scope, $rootScope, $compile, $location, $log, $stateParams, TeamForm, GenerateForm, - Rest, Alert, ProcessErrors, LoadBreadCrumbs, ReturnToCaller, ClearScope, GenerateList, + Rest, Alert, ProcessErrors, ReturnToCaller, ClearScope, GenerateList, OrganizationList, SearchInit, PaginateInit, GetBasePath, LookUpInit, Wait) { ClearScope('htmlTemplate'); //Garbage collection. Don't leave behind any listeners/watchers from the prior //$scope. @@ -127,7 +125,6 @@ export function TeamsAdd($scope, $rootScope, $compile, $location, $log, $statePa $rootScope.flashMessage = null; generator.reset(); - LoadBreadCrumbs(); LookUpInit({ scope: $scope, @@ -169,13 +166,13 @@ export function TeamsAdd($scope, $rootScope, $compile, $location, $log, $statePa } TeamsAdd.$inject = ['$scope', '$rootScope', '$compile', '$location', '$log', '$stateParams', 'TeamForm', 'GenerateForm', - 'Rest', 'Alert', 'ProcessErrors', 'LoadBreadCrumbs', 'ReturnToCaller', 'ClearScope', 'generateList', + 'Rest', 'Alert', 'ProcessErrors', 'ReturnToCaller', 'ClearScope', 'generateList', 'OrganizationList', 'SearchInit', 'PaginateInit', 'GetBasePath', 'LookUpInit', 'Wait' ]; export function TeamsEdit($scope, $rootScope, $compile, $location, $log, $stateParams, TeamForm, GenerateForm, Rest, Alert, ProcessErrors, - LoadBreadCrumbs, RelatedSearchInit, RelatedPaginateInit, ReturnToCaller, ClearScope, LookUpInit, Prompt, GetBasePath, CheckAccess, + RelatedSearchInit, RelatedPaginateInit, ReturnToCaller, ClearScope, LookUpInit, Prompt, GetBasePath, CheckAccess, OrganizationList, Wait, Stream, fieldChoices, fieldLabels, permissionsSearchSelect) { ClearScope(); @@ -419,6 +416,6 @@ export function TeamsEdit($scope, $rootScope, $compile, $location, $log, $stateP } TeamsEdit.$inject = ['$scope', '$rootScope', '$compile', '$location', '$log', '$stateParams', 'TeamForm', - 'GenerateForm', 'Rest', 'Alert', 'ProcessErrors', 'LoadBreadCrumbs', 'RelatedSearchInit', 'RelatedPaginateInit', + 'GenerateForm', 'Rest', 'Alert', 'ProcessErrors', 'RelatedSearchInit', 'RelatedPaginateInit', 'ReturnToCaller', 'ClearScope', 'LookUpInit', 'Prompt', 'GetBasePath', 'CheckAccess', 'OrganizationList', 'Wait', 'Stream', 'fieldChoices', 'fieldLabels', 'permissionsSearchSelect' ]; diff --git a/awx/ui/client/src/controllers/Users.js b/awx/ui/client/src/controllers/Users.js index 7d7633b95d..d64cdfaa5c 100644 --- a/awx/ui/client/src/controllers/Users.js +++ b/awx/ui/client/src/controllers/Users.js @@ -3,7 +3,7 @@ * * All Rights Reserved *************************************************/ - + /** * @ngdoc function * @name controllers.function:Users @@ -11,7 +11,7 @@ */ -export function UsersList($scope, $rootScope, $location, $log, $stateParams, Rest, Alert, UserList, GenerateList, LoadBreadCrumbs, +export function UsersList($scope, $rootScope, $location, $log, $stateParams, Rest, Alert, UserList, GenerateList, Prompt, SearchInit, PaginateInit, ReturnToCaller, ClearScope, ProcessErrors, GetBasePath, SelectionInit, Wait, Stream) { ClearScope(); @@ -24,7 +24,7 @@ export function UsersList($scope, $rootScope, $location, $log, $stateParams, Res url = (base === 'organizations') ? GetBasePath('organizations') + $stateParams.organization_id + '/users/' : GetBasePath('teams') + $stateParams.team_id + '/users/'; - generator.inject(UserList, { mode: mode, scope: $scope, breadCrumbs:(($stateParams.organization_id || $stateParams.team_id) ? true : false) }); + generator.inject(UserList, { mode: mode, scope: $scope }); $scope.selected = []; @@ -55,8 +55,6 @@ export function UsersList($scope, $rootScope, $location, $log, $stateParams, Res }); $scope.search(list.iterator); - LoadBreadCrumbs(); - $scope.showActivity = function () { Stream({ scope: $scope }); }; @@ -98,13 +96,13 @@ export function UsersList($scope, $rootScope, $location, $log, $stateParams, Res } UsersList.$inject = ['$scope', '$rootScope', '$location', '$log', '$stateParams', 'Rest', 'Alert', 'UserList', 'generateList', - 'LoadBreadCrumbs', 'Prompt', 'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope', 'ProcessErrors', 'GetBasePath', + 'Prompt', 'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope', 'ProcessErrors', 'GetBasePath', 'SelectionInit', 'Wait', 'Stream' ]; export function UsersAdd($scope, $rootScope, $compile, $location, $log, $stateParams, UserForm, GenerateForm, Rest, Alert, ProcessErrors, - LoadBreadCrumbs, ReturnToCaller, ClearScope, GetBasePath, LookUpInit, OrganizationList, ResetForm, Wait) { + ReturnToCaller, ClearScope, GetBasePath, LookUpInit, OrganizationList, ResetForm, Wait) { ClearScope(); @@ -123,8 +121,6 @@ export function UsersAdd($scope, $rootScope, $compile, $location, $log, $statePa generator.reset(); - LoadBreadCrumbs(); - // Configure the lookup dialog. If we're adding a user through the Organizations tab, // default the Organization value. LookUpInit({ @@ -202,13 +198,13 @@ export function UsersAdd($scope, $rootScope, $compile, $location, $log, $statePa } UsersAdd.$inject = ['$scope', '$rootScope', '$compile', '$location', '$log', '$stateParams', 'UserForm', 'GenerateForm', - 'Rest', 'Alert', 'ProcessErrors', 'LoadBreadCrumbs', 'ReturnToCaller', 'ClearScope', 'GetBasePath', 'LookUpInit', + 'Rest', 'Alert', 'ProcessErrors', 'ReturnToCaller', 'ClearScope', 'GetBasePath', 'LookUpInit', 'OrganizationList', 'ResetForm', 'Wait' ]; export function UsersEdit($scope, $rootScope, $compile, $location, $log, $stateParams, UserForm, GenerateForm, Rest, Alert, - ProcessErrors, LoadBreadCrumbs, RelatedSearchInit, RelatedPaginateInit, ReturnToCaller, ClearScope, GetBasePath, + ProcessErrors, RelatedSearchInit, RelatedPaginateInit, ReturnToCaller, ClearScope, GetBasePath, Prompt, CheckAccess, ResetForm, Wait, Stream, fieldChoices, fieldLabels, permissionsSearchSelect) { ClearScope(); @@ -528,6 +524,6 @@ export function UsersEdit($scope, $rootScope, $compile, $location, $log, $stateP } UsersEdit.$inject = ['$scope', '$rootScope', '$compile', '$location', '$log', '$stateParams', 'UserForm', 'GenerateForm', - 'Rest', 'Alert', 'ProcessErrors', 'LoadBreadCrumbs', 'RelatedSearchInit', 'RelatedPaginateInit', 'ReturnToCaller', 'ClearScope', + 'Rest', 'Alert', 'ProcessErrors', 'RelatedSearchInit', 'RelatedPaginateInit', 'ReturnToCaller', 'ClearScope', 'GetBasePath', 'Prompt', 'CheckAccess', 'ResetForm', 'Wait', 'Stream', 'fieldChoices', 'fieldLabels', 'permissionsSearchSelect' ]; diff --git a/awx/ui/client/src/helpers/Groups.js b/awx/ui/client/src/helpers/Groups.js index d775398a99..d1c34783f3 100644 --- a/awx/ui/client/src/helpers/Groups.js +++ b/awx/ui/client/src/helpers/Groups.js @@ -459,7 +459,6 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', listGenerator.name GenerateList.inject(list, { mode: 'edit', id: 'schedules-list', - breadCrumbs: false, searchSize: 'col-lg-6 col-md-5 col-sm-5 col-xs-5', scope: schedule_scope }); @@ -751,9 +750,9 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', listGenerator.name $compile(elem)(modal_scope); var form_scope = - generator.inject(GroupForm, { mode: mode, id: 'properties-tab', breadCrumbs: false, related: false, scope: properties_scope }); + generator.inject(GroupForm, { mode: mode, id: 'properties-tab', related: false, scope: properties_scope }); var source_form_scope = - generator.inject(SourceForm, { mode: mode, id: 'sources-tab', breadCrumbs: false, related: false, scope: sources_scope }); + generator.inject(SourceForm, { mode: mode, id: 'sources-tab', related: false, scope: sources_scope }); //generator.reset(); @@ -2026,7 +2025,6 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', listGenerator.name scope = generator.inject(form, { mode: 'edit', id: 'form-container', - breadCrumbs: false, related: false }); diff --git a/awx/ui/client/src/helpers/Hosts.js b/awx/ui/client/src/helpers/Hosts.js index 693137ccd8..1a157d6101 100644 --- a/awx/ui/client/src/helpers/Hosts.js +++ b/awx/ui/client/src/helpers/Hosts.js @@ -240,7 +240,7 @@ angular.module('HostsHelper', [ 'RestServices', 'Utilities', listGenerator.name, generator = GenerateList; // Inject the list html - generator.inject(InventoryHosts, { scope: host_scope, mode: 'edit', id: 'hosts-container', breadCrumbs: false, searchSize: 'col-lg-6 col-md-6 col-sm-6' }); + generator.inject(InventoryHosts, { scope: host_scope, mode: 'edit', id: 'hosts-container', searchSize: 'col-lg-6 col-md-6 col-sm-6' }); // Load data HostsReload({ scope: host_scope, group_id: group_id, inventory_id: inventory_id, parent_scope: group_scope, pageSize: pageSize }); @@ -308,7 +308,6 @@ angular.module('HostsHelper', [ 'RestServices', 'Utilities', listGenerator.name, scope = generator.inject(list, { id: 'form-modal-body', mode: 'select', - breadCrumbs: false, selectButton: false }); @@ -470,7 +469,7 @@ angular.module('HostsHelper', [ 'RestServices', 'Utilities', listGenerator.name, buttons, url, form_scope; form_scope = - generator.inject(HostForm, { mode: 'edit', id: 'host-modal-dialog', breadCrumbs: false, related: false, scope: scope }); + generator.inject(HostForm, { mode: 'edit', id: 'host-modal-dialog', related: false, scope: scope }); generator.reset(); buttons = [{ diff --git a/awx/ui/client/src/helpers/JobTemplates.js b/awx/ui/client/src/helpers/JobTemplates.js index eaf0e8df18..b7068e0cb8 100644 --- a/awx/ui/client/src/helpers/JobTemplates.js +++ b/awx/ui/client/src/helpers/JobTemplates.js @@ -18,9 +18,9 @@ angular.module('JobTemplatesHelper', ['Utilities']) * */ -.factory('CallbackHelpInit', ['$location', 'GetBasePath', 'Rest', 'JobTemplateForm', 'GenerateForm', '$stateParams', 'LoadBreadCrumbs', 'ProcessErrors', 'ParseTypeChange', +.factory('CallbackHelpInit', ['$location', 'GetBasePath', 'Rest', 'JobTemplateForm', 'GenerateForm', '$stateParams', 'ProcessErrors', 'ParseTypeChange', 'ParseVariableString', 'Empty', 'LookUpInit', 'InventoryList', 'CredentialList','ProjectList', 'RelatedSearchInit', 'RelatedPaginateInit', 'Wait', - function($location, GetBasePath, Rest, JobTemplateForm, GenerateForm, $stateParams, LoadBreadCrumbs, ProcessErrors,ParseTypeChange, + function($location, GetBasePath, Rest, JobTemplateForm, GenerateForm, $stateParams, ProcessErrors,ParseTypeChange, ParseVariableString, Empty, LookUpInit, InventoryList, CredentialList, ProjectList, RelatedSearchInit, RelatedPaginateInit, Wait) { return function(params) { @@ -77,7 +77,6 @@ angular.module('JobTemplatesHelper', ['Utilities']) Rest.get() .success(function (data) { var fld, i; - LoadBreadCrumbs({ path: '/job_templates/' + id, title: data.name }); for (fld in form.fields) { if (fld !== 'variables' && data[fld] !== null && data[fld] !== undefined) { if (form.fields[fld].type === 'select') { diff --git a/awx/ui/client/src/helpers/Jobs.js b/awx/ui/client/src/helpers/Jobs.js index 64b231180e..adbe640f4b 100644 --- a/awx/ui/client/src/helpers/Jobs.js +++ b/awx/ui/client/src/helpers/Jobs.js @@ -193,7 +193,7 @@ export default $('#inventory-modal-container').empty().append(html); - scope = generator.inject(form, { mode: 'edit', id: 'form-container', breadCrumbs: false, related: false }); + scope = generator.inject(form, { mode: 'edit', id: 'form-container', related: false }); // Set modal dimensions based on viewport width ww = $(document).width(); @@ -395,7 +395,6 @@ export default GenerateList.inject(list, { mode: 'edit', id: id, - breadCrumbs: false, scope: scope, showSearch: false }); diff --git a/awx/ui/client/src/helpers/License.js b/awx/ui/client/src/helpers/License.js index fd7314e7af..70cbb59c72 100644 --- a/awx/ui/client/src/helpers/License.js +++ b/awx/ui/client/src/helpers/License.js @@ -144,7 +144,7 @@ export default html += "
"; if (IsAdmin()) { - html += GenerateForm.buildHTML(LicenseUpdateForm, { mode: 'edit', showButtons:((includeFormButton) ? true : false), breadCrumbs: false }); + html += GenerateForm.buildHTML(LicenseUpdateForm, { mode: 'edit', showButtons:((includeFormButton) ? true : false) }); } html += ""; diff --git a/awx/ui/client/src/helpers/Schedules.js b/awx/ui/client/src/helpers/Schedules.js index 36161cce3e..0537a07c4d 100644 --- a/awx/ui/client/src/helpers/Schedules.js +++ b/awx/ui/client/src/helpers/Schedules.js @@ -707,7 +707,6 @@ export default GenerateList.inject(list, { mode: 'edit', id: id, - breadCrumbs: false, scope: scope, searchSize: (searchSize) ? searchSize : 'col-lg-6 col-md-6 col-sm-6 col-xs-12', showSearch: true diff --git a/awx/ui/client/src/helpers/inventory.js b/awx/ui/client/src/helpers/inventory.js index 87a80f27e7..cd85eb2d04 100644 --- a/awx/ui/client/src/helpers/inventory.js +++ b/awx/ui/client/src/helpers/inventory.js @@ -106,7 +106,6 @@ export default showButtons: false, showActions: false, id: 'inventory-edit-modal-dialog', - breadCrumbs: false, related: false, scope: scope }); diff --git a/awx/ui/client/src/inventory-scripts/add/add.partial.html b/awx/ui/client/src/inventory-scripts/add/add.partial.html index a9e7a04b9b..aa722e6705 100644 --- a/awx/ui/client/src/inventory-scripts/add/add.partial.html +++ b/awx/ui/client/src/inventory-scripts/add/add.partial.html @@ -1,12 +1,3 @@ - - - - - - -
diff --git a/awx/ui/client/src/inventory-scripts/edit/edit.controller.js b/awx/ui/client/src/inventory-scripts/edit/edit.controller.js index 39dfaa4b0c..a464338cd4 100644 --- a/awx/ui/client/src/inventory-scripts/edit/edit.controller.js +++ b/awx/ui/client/src/inventory-scripts/edit/edit.controller.js @@ -27,7 +27,6 @@ export default generator.inject(form, { mode: 'edit' , scope:$scope, - breadCrumbs: true, related: false, activityStream: false }); diff --git a/awx/ui/client/src/inventory-scripts/edit/edit.partial.html b/awx/ui/client/src/inventory-scripts/edit/edit.partial.html index 854bcf4fad..555ab2462d 100644 --- a/awx/ui/client/src/inventory-scripts/edit/edit.partial.html +++ b/awx/ui/client/src/inventory-scripts/edit/edit.partial.html @@ -1,9 +1,3 @@ - - - - - -
diff --git a/awx/ui/client/src/inventory-scripts/list/list.partial.html b/awx/ui/client/src/inventory-scripts/list/list.partial.html index 6adbbb27e6..33085edcb3 100644 --- a/awx/ui/client/src/inventory-scripts/list/list.partial.html +++ b/awx/ui/client/src/inventory-scripts/list/list.partial.html @@ -1,8 +1,3 @@ - - - - -
diff --git a/awx/ui/client/src/job-templates/survey-maker/questions/edit.factory.js b/awx/ui/client/src/job-templates/survey-maker/questions/edit.factory.js index 6a4ab46eea..2b6ceb420c 100644 --- a/awx/ui/client/src/job-templates/survey-maker/questions/edit.factory.js +++ b/awx/ui/client/src/job-templates/survey-maker/questions/edit.factory.js @@ -77,7 +77,7 @@ export default } scope.removeGenerateForm = scope.$on('GenerateForm', function() { tmpVar = scope.mode; - GenerateForm.inject(form, { id: 'question_'+index, mode: 'edit' , related: false, scope:scope, breadCrumbs: false}); + GenerateForm.inject(form, { id: 'question_'+index, mode: 'edit' , related: false, scope:scope }); scope.mode = tmpVar; scope.$emit('FillQuestionForm'); }); diff --git a/awx/ui/client/src/job-templates/survey-maker/shared/question-definition.form.js b/awx/ui/client/src/job-templates/survey-maker/shared/question-definition.form.js index 01bfff1f5f..fa416b1768 100644 --- a/awx/ui/client/src/job-templates/survey-maker/shared/question-definition.form.js +++ b/awx/ui/client/src/job-templates/survey-maker/shared/question-definition.form.js @@ -19,7 +19,6 @@ export default name: 'survey_question', well: true, twoColumns: true, - breadcrumbs: false, fields: { question_name: { diff --git a/awx/ui/client/src/job-templates/survey-maker/surveys/init.factory.js b/awx/ui/client/src/job-templates/survey-maker/surveys/init.factory.js index 31e584b946..2495daf614 100644 --- a/awx/ui/client/src/job-templates/survey-maker/surveys/init.factory.js +++ b/awx/ui/client/src/job-templates/survey-maker/surveys/init.factory.js @@ -63,7 +63,7 @@ export default scope.addQuestion = function(){ var tmpMode = scope.mode; - GenerateForm.inject(form, { id:'new_question', mode: 'add' , scope: scope, related: false, breadCrumbs: false}); + GenerateForm.inject(form, { id:'new_question', mode: 'add' , scope: scope, related: false}); scope.mode = tmpMode; scope.required = true; //set the required checkbox to true via the ngmodel attached to scope.required. scope.text_min = null; diff --git a/awx/ui/client/src/management-jobs/list/list.partial.html b/awx/ui/client/src/management-jobs/list/list.partial.html index 01e12151f9..7e8fb31e45 100644 --- a/awx/ui/client/src/management-jobs/list/list.partial.html +++ b/awx/ui/client/src/management-jobs/list/list.partial.html @@ -1,8 +1,3 @@ - - - - -
diff --git a/awx/ui/client/src/management-jobs/schedule/schedule.partial.html b/awx/ui/client/src/management-jobs/schedule/schedule.partial.html index 2374f050c5..43b01efc55 100644 --- a/awx/ui/client/src/management-jobs/schedule/schedule.partial.html +++ b/awx/ui/client/src/management-jobs/schedule/schedule.partial.html @@ -1,9 +1,3 @@ - - - - - -
diff --git a/awx/ui/client/src/partials/credentials.html b/awx/ui/client/src/partials/credentials.html index 089d6cf399..6255311d45 100644 --- a/awx/ui/client/src/partials/credentials.html +++ b/awx/ui/client/src/partials/credentials.html @@ -1,18 +1,3 @@ - - - - - - - - -
diff --git a/awx/ui/client/src/partials/inventory-manage.html b/awx/ui/client/src/partials/inventory-manage.html index 0ec23f3107..b8fc629267 100644 --- a/awx/ui/client/src/partials/inventory-manage.html +++ b/awx/ui/client/src/partials/inventory-manage.html @@ -1,12 +1,6 @@
- -
diff --git a/awx/ui/client/src/partials/job_detail.html b/awx/ui/client/src/partials/job_detail.html index e1d969f612..e4aba4ec3b 100644 --- a/awx/ui/client/src/partials/job_detail.html +++ b/awx/ui/client/src/partials/job_detail.html @@ -1,15 +1,6 @@
- -
diff --git a/awx/ui/client/src/partials/job_stdout.html b/awx/ui/client/src/partials/job_stdout.html index 7175cc8608..6412480fcb 100644 --- a/awx/ui/client/src/partials/job_stdout.html +++ b/awx/ui/client/src/partials/job_stdout.html @@ -5,14 +5,7 @@
- -
+
diff --git a/awx/ui/client/src/partials/job_stdout_adhoc.html b/awx/ui/client/src/partials/job_stdout_adhoc.html index f4e48648f8..78637571e9 100644 --- a/awx/ui/client/src/partials/job_stdout_adhoc.html +++ b/awx/ui/client/src/partials/job_stdout_adhoc.html @@ -3,19 +3,8 @@
-
+ class="list-actions pull-right col-md-12"> \n"; diff --git a/awx/ui/client/src/system-tracking/system-tracking.partial.html b/awx/ui/client/src/system-tracking/system-tracking.partial.html index 01460f49a8..85580ac630 100644 --- a/awx/ui/client/src/system-tracking/system-tracking.partial.html +++ b/awx/ui/client/src/system-tracking/system-tracking.partial.html @@ -1,9 +1,4 @@
- - - - -

@@ -12,11 +7,6 @@

- - - - -
diff --git a/awx/ui/client/src/widgets/Stream.js b/awx/ui/client/src/widgets/Stream.js index 5cbd299edf..b793d0bab1 100644 --- a/awx/ui/client/src/widgets/Stream.js +++ b/awx/ui/client/src/widgets/Stream.js @@ -67,8 +67,8 @@ angular.module('StreamWidget', ['RestServices', 'Utilities', 'StreamListDefiniti } ]) -.factory('HideStream', ['LoadBreadCrumbs', - function (LoadBreadCrumbs) { +.factory('HideStream', [ + function () { return function () { // Remove the stream widget @@ -92,62 +92,6 @@ angular.module('StreamWidget', ['RestServices', 'Utilities', 'StreamListDefiniti 'min-height': 0 }); //let the parent height go back to normal }, 500); - - LoadBreadCrumbs(); - }; - } -]) - -.factory('StreamBreadCrumbs', ['$rootScope', '$location', - function ($rootScope, $location) { - return function () { - // Load the breadcrumbs array. We have to do things a bit different than Utilities.LoadBreadcrumbs. - // Rather than botch that all up, we'll do our own thing here. - $rootScope.breadcrumbs = []; - var path, title, i, j, paths = $location.path().split('/'), - capitalizeTitle = function(title) { - return title.split("_") - .map(function(title) { - return title.charAt(0).toUpperCase() + title.slice(1); - }).join(" "); - }; - paths.splice(0, 1); - for (i = 0; i < paths.length; i++) { - if (/^\d+/.test(paths[i])) { - path = ''; - title = ''; - for (j = 0; j <= i; j++) { - path += '/' + paths[j]; - } - for (j = 0; j < $rootScope.crumbCache.length; j++) { - if ($rootScope.crumbCache[j].path === path) { - title = $rootScope.crumbCache[j].title; - break; - } - } - if (!title) { - title = paths[i - 1].substr(0, paths[i - 1].length - 1); - title = capitalizeTitle(title); - title = (title === 'Inventorie') ? 'Inventory' : title; - } - } else { - path = ''; - title = ''; - if (i > 0) { - for (j = 0; j <= i; j++) { - path += '/' + paths[j]; - } - } else { - path = '/' + paths[i]; - } - title = paths[i]; - title = capitalizeTitle(title); - } - $rootScope.breadcrumbs.push({ - path: path, - title: title - }); - } }; } ]) @@ -393,9 +337,9 @@ angular.module('StreamWidget', ['RestServices', 'Utilities', 'StreamListDefiniti .factory('Stream', ['$rootScope', '$location', 'Rest', 'GetBasePath', 'ProcessErrors', 'Wait', 'StreamList', 'SearchInit', 'PaginateInit', 'generateList', 'FormatDate', 'ShowStream', 'HideStream', 'BuildDescription', 'FixUrl', 'BuildUrl', - 'ShowDetail', 'StreamBreadCrumbs', 'setStreamHeight', 'Find', 'Store', + 'ShowDetail', 'setStreamHeight', 'Find', 'Store', function ($rootScope, $location, Rest, GetBasePath, ProcessErrors, Wait, StreamList, SearchInit, PaginateInit, GenerateList, - FormatDate, ShowStream, HideStream, BuildDescription, FixUrl, BuildUrl, ShowDetail, StreamBreadCrumbs, setStreamHeight, + FormatDate, ShowStream, HideStream, BuildDescription, FixUrl, BuildUrl, ShowDetail, setStreamHeight, Find, Store) { return function (params) { @@ -440,16 +384,6 @@ angular.module('StreamWidget', ['RestServices', 'Utilities', 'StreamListDefiniti // Add a container for the stream widget $('#main-view').append("
"); - StreamBreadCrumbs(); - - // Fix inventory name. The way we're doing breadcrumbs doesn't support bind variables. - if (inventory_name) { - itm = Find({ list: $rootScope.breadcrumbs, key: 'title', val: '{{ inventory.name }}' }); - if (itm) { - itm.title = inventory_name; - } - } - ShowStream(); // Generate the list