diff --git a/awx/ui/client/src/app.js b/awx/ui/client/src/app.js index c0b72d9dcf..b62191f36e 100644 --- a/awx/ui/client/src/app.js +++ b/awx/ui/client/src/app.js @@ -613,6 +613,10 @@ var tower = angular.module('Tower', [ data: { activityStreamId: 'organization_id' }, + ncyBreadcrumb: { + parent: "organizations", + label: "{{name}}" + }, resolve: { features: ['FeaturesService', function(FeaturesService) { return FeaturesService.get(); diff --git a/awx/ui/client/src/bread-crumb/bread-crumb.block.less b/awx/ui/client/src/bread-crumb/bread-crumb.block.less index e1397788d0..de05b2f113 100644 --- a/awx/ui/client/src/bread-crumb/bread-crumb.block.less +++ b/awx/ui/client/src/bread-crumb/bread-crumb.block.less @@ -52,6 +52,7 @@ .BreadCrumb-item { display: inline-block; color: #B7B7B7; + text-transform: uppercase; } .BreadCrumb-item + .BreadCrumb-item:before { diff --git a/awx/ui/client/src/controllers/Organizations.js b/awx/ui/client/src/controllers/Organizations.js index c4966d257c..fb1ebecfa1 100644 --- a/awx/ui/client/src/controllers/Organizations.js +++ b/awx/ui/client/src/controllers/Organizations.js @@ -12,13 +12,38 @@ export function OrganizationsList($stateParams, $scope, $rootScope, $location, - $log, Rest, Alert, Prompt, ClearScope, ProcessErrors, GetBasePath, Wait, + $log, $compile, Rest, PaginateWidget, PaginateInit, SearchInit, OrganizationList, Alert, Prompt, ClearScope, ProcessErrors, GetBasePath, Wait, $state) { ClearScope(); - var defaultUrl = GetBasePath('organizations'); + var defaultUrl = GetBasePath('organizations'), + list = OrganizationList, + pageSize = $scope.orgCount; + PaginateInit({ + scope: $scope, + list: list, + url: defaultUrl, + pageSize: pageSize, + }); + SearchInit({ + scope: $scope, + list: list, + url: defaultUrl, + }); + + $scope.search(list.iterator); + + $scope.PaginateWidget = PaginateWidget({ + iterator: list.iterator, + set: 'organizations' + }); + + var paginationContainer = $('#pagination-container'); + paginationContainer.html($scope.PaginateWidget); + $compile(paginationContainer.contents())($scope) + var parseCardData = function (cards) { return cards.map(function (card) { var val = {}; @@ -150,7 +175,7 @@ export function OrganizationsList($stateParams, $scope, $rootScope, $location, } OrganizationsList.$inject = ['$stateParams', '$scope', '$rootScope', - '$location', '$log', 'Rest', 'Alert', 'Prompt', 'ClearScope', + '$location', '$log', '$compile', 'Rest', 'PaginateWidget', 'PaginateInit', 'SearchInit', 'OrganizationList', 'Alert', 'Prompt', 'ClearScope', 'ProcessErrors', 'GetBasePath', 'Wait', '$state' ]; @@ -354,4 +379,4 @@ OrganizationsEdit.$inject = ['$scope', '$rootScope', '$compile', '$location', '$log', '$stateParams', 'OrganizationForm', 'GenerateForm', 'Rest', 'Alert', 'ProcessErrors', 'RelatedSearchInit', 'RelatedPaginateInit', 'Prompt', 'ClearScope', 'GetBasePath', 'Wait', '$state' -]; +]; \ No newline at end of file diff --git a/awx/ui/client/src/partials/organizations.html b/awx/ui/client/src/partials/organizations.html index b59c4c675c..c04044ac94 100644 --- a/awx/ui/client/src/partials/organizations.html +++ b/awx/ui/client/src/partials/organizations.html @@ -57,4 +57,6 @@ - +