mirror of
https://github.com/ansible/awx.git
synced 2026-01-11 18:09:57 -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:
parent
95b99bbc89
commit
d24800bf5f
@ -19,7 +19,7 @@ function AdminsList($scope, $rootScope, $location, $log, $routeParams, Rest, Ale
|
||||
mode = 'select',
|
||||
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 });
|
||||
|
||||
|
||||
@ -24,7 +24,7 @@ function CredentialsList($scope, $rootScope, $location, $log, $routeParams, Rest
|
||||
mode = (base === 'credentials') ? 'edit' : 'select',
|
||||
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.credentialLoading = true;
|
||||
|
||||
@ -21,7 +21,7 @@ function PermissionsList($scope, $rootScope, $location, $log, $routeParams, Rest
|
||||
defaultUrl = GetBasePath(base),
|
||||
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 += '/permissions/';
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@ function ProjectsList ($scope, $rootScope, $location, $log, $routeParams, Rest,
|
||||
url = (base === 'teams') ? GetBasePath('teams') + $routeParams.team_id + '/projects/' : defaultUrl,
|
||||
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;
|
||||
$scope.projectLoading = true;
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
function ScheduleEditController($scope, $compile, $location, $routeParams, SchedulesList, Rest, ProcessErrors, LoadBreadCrumbs, ReturnToCaller, ClearScope,
|
||||
GetBasePath, Wait, Breadcrumbs, Find, LoadDialogPartial, LoadSchedulesScope, GetChoices, Stream) {
|
||||
|
||||
|
||||
ClearScope();
|
||||
|
||||
var base, e, id, url, parentObject;
|
||||
@ -28,7 +28,7 @@ GetBasePath, Wait, Breadcrumbs, Find, LoadDialogPartial, LoadSchedulesScope, Get
|
||||
list[idx].play_tip = (element.enabled) ? 'Schedule is Active. Click to temporarily stop.' : 'Schedule is temporarily stopped. Click to activate.';
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
if ($scope.removeParentLoaded) {
|
||||
$scope.removeParentLoaded();
|
||||
}
|
||||
@ -54,7 +54,7 @@ GetBasePath, Wait, Breadcrumbs, Find, LoadDialogPartial, LoadSchedulesScope, Get
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
|
||||
if ($scope.removeChoicesReady) {
|
||||
$scope.removeChocesReady();
|
||||
}
|
||||
@ -83,7 +83,7 @@ GetBasePath, Wait, Breadcrumbs, Find, LoadDialogPartial, LoadSchedulesScope, Get
|
||||
};
|
||||
|
||||
Wait('start');
|
||||
|
||||
|
||||
GetChoices({
|
||||
scope: $scope,
|
||||
url: GetBasePath('unified_jobs'), //'/static/sample/data/types/data.json'
|
||||
|
||||
@ -22,7 +22,7 @@ function UsersList($scope, $rootScope, $location, $log, $routeParams, Rest, Aler
|
||||
url = (base === 'organizations') ? GetBasePath('organizations') + $routeParams.organization_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 = [];
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user