External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-20 10:27:34 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1762 from jlmitch5/appTokenSearchPath

Browse Source 
update app tokens search path
This commit is contained in:
John Mitchell
2018-05-22 12:00:42 -04:00
committed by GitHub
parent e2cd05e8e2 a096051dc3
commit 22cffccc38
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
awx/ui/client/features/applications/list-applications-users.controller.js
View File

@@ -8,7 +8,9 @@ function ListApplicationsUsersController (
$scope, $scope,
Dataset, Dataset,
resolvedModels, resolvedModels,
strings strings,
$stateParams,
GetBasePath
) { ) {
const vm = this || {}; const vm = this || {};
// const application = resolvedModels; // const application = resolvedModels;
@@ -21,9 +23,15 @@ function ListApplicationsUsersController (
$scope.list = { iterator, name, basePath: 'applications' }; $scope.list = { iterator, name, basePath: 'applications' };
$scope.collection = { iterator }; $scope.collection = { iterator };
$scope.tokenBasePath = `${GetBasePath('applications')}${$stateParams.application_id}/tokens`;
$scope[key] = Dataset.data; $scope[key] = Dataset.data;
vm.usersCount = Dataset.data.count; vm.usersCount = Dataset.data.count;
$scope[name] = Dataset.data.results; $scope[name] = Dataset.data.results;
$scope.$on('updateDataset', (e, dataset) => {
$scope[key] = dataset;
$scope[name] = dataset.results;
vm.usersCount = dataset.count;
});
vm.getLastUsed = user => { vm.getLastUsed = user => {
const lastUsed = _.get(user, 'last_used'); const lastUsed = _.get(user, 'last_used');
@@ -49,7 +57,9 @@ ListApplicationsUsersController.$inject = [
'$scope', '$scope',
'Dataset', 'Dataset',
'resolvedModels', 'resolvedModels',
'ApplicationsStrings' 'ApplicationsStrings',
'$stateParams',
'GetBasePath'
]; ];
export default ListApplicationsUsersController; export default ListApplicationsUsersController;

2
awx/ui/client/features/applications/list-applications-users.view.html
View File

@@ -2,7 +2,7 @@
<smart-search <smart-search
class="at-List-search" class="at-List-search"
django-model="users" django-model="users"
base-path="users" base-path="{{ tokenBasePath }}"
iterator="user" iterator="user"
list="list" list="list"
dataset="user_dataset" dataset="user_dataset"