mirror of
https://github.com/ansible/awx.git
synced 2026-03-02 09:18:48 -03:30
Missing breadcrumbs
Added breadcrumbs back in for nested lists (i.e. adding users to an organization or a project to a team).
This commit is contained in:
@@ -19,7 +19,7 @@ function AdminsList($scope, $rootScope, $location, $log, $routeParams, Rest, Ale
|
|||||||
mode = 'select',
|
mode = 'select',
|
||||||
url = GetBasePath('organizations') + $routeParams.organization_id + '/admins/';
|
url = GetBasePath('organizations') + $routeParams.organization_id + '/admins/';
|
||||||
|
|
||||||
generator.inject(AdminList, { mode: mode, scope: $scope });
|
generator.inject(AdminList, { mode: mode, scope: $scope, breadCrumbs: true });
|
||||||
|
|
||||||
SelectionInit({ scope: $scope, list: list, url: url, returnToCaller: 1 });
|
SelectionInit({ scope: $scope, list: list, url: url, returnToCaller: 1 });
|
||||||
|
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ function CredentialsList($scope, $rootScope, $location, $log, $routeParams, Rest
|
|||||||
mode = (base === 'credentials') ? 'edit' : 'select',
|
mode = (base === 'credentials') ? 'edit' : 'select',
|
||||||
url;
|
url;
|
||||||
|
|
||||||
view.inject(list, { mode: mode, scope: $scope });
|
view.inject(list, { mode: mode, scope: $scope, breadCrumbs:(($routeParams.user_id || $routeParams.team_id) ? true : false) });
|
||||||
|
|
||||||
$scope.selected = [];
|
$scope.selected = [];
|
||||||
$scope.credentialLoading = true;
|
$scope.credentialLoading = true;
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ function PermissionsList($scope, $rootScope, $location, $log, $routeParams, Rest
|
|||||||
defaultUrl = GetBasePath(base),
|
defaultUrl = GetBasePath(base),
|
||||||
generator = GenerateList;
|
generator = GenerateList;
|
||||||
|
|
||||||
generator.inject(list, { mode: 'edit', scope: $scope });
|
generator.inject(list, { mode: 'edit', scope: $scope, breadCrumbs: true });
|
||||||
defaultUrl += ($routeParams.user_id !== undefined) ? $routeParams.user_id : $routeParams.team_id;
|
defaultUrl += ($routeParams.user_id !== undefined) ? $routeParams.user_id : $routeParams.team_id;
|
||||||
defaultUrl += '/permissions/';
|
defaultUrl += '/permissions/';
|
||||||
|
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ function ProjectsList ($scope, $rootScope, $location, $log, $routeParams, Rest,
|
|||||||
url = (base === 'teams') ? GetBasePath('teams') + $routeParams.team_id + '/projects/' : defaultUrl,
|
url = (base === 'teams') ? GetBasePath('teams') + $routeParams.team_id + '/projects/' : defaultUrl,
|
||||||
choiceCount = 0;
|
choiceCount = 0;
|
||||||
|
|
||||||
view.inject(list, { mode: mode, scope: $scope });
|
view.inject(list, { mode: mode, scope: $scope, breadCrumbs:(($routeParams.team_id) ? true : false)});
|
||||||
|
|
||||||
$rootScope.flashMessage = null;
|
$rootScope.flashMessage = null;
|
||||||
$scope.projectLoading = true;
|
$scope.projectLoading = true;
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ function UsersList($scope, $rootScope, $location, $log, $routeParams, Rest, Aler
|
|||||||
url = (base === 'organizations') ? GetBasePath('organizations') + $routeParams.organization_id + '/users/' :
|
url = (base === 'organizations') ? GetBasePath('organizations') + $routeParams.organization_id + '/users/' :
|
||||||
GetBasePath('teams') + $routeParams.team_id + '/users/';
|
GetBasePath('teams') + $routeParams.team_id + '/users/';
|
||||||
|
|
||||||
generator.inject(UserList, { mode: mode, scope: $scope });
|
generator.inject(UserList, { mode: mode, scope: $scope, breadCrumbs:(($routeParams.organization_id || $routeParams.team_id) ? true : false) });
|
||||||
|
|
||||||
$scope.selected = [];
|
$scope.selected = [];
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user