External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-12 18:40:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

add tokens to activity stream

Browse Source
This commit is contained in:
John Mitchell 2018-05-10 14:13:13 -04:00
parent 924cb51d51
commit 8a2c3ce716
No known key found for this signature in database
GPG Key ID: FE6A9B5BD4EB5C94
5 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
awx/ui/client/features/users/tokens/users-tokens-add.route.js
View File

@ -21,6 +21,11 @@ export default {
name: 'users.edit.tokens.add',
params: {
},
data: {
activityStream: true,
activityStreamTarget: 'o_auth2_access_token',
noActivityStreamID: true
},
ncyBreadcrumb: {
label: N_('CREATE TOKEN')
},

5
awx/ui/client/features/users/tokens/users-tokens-list.route.js
View File

@ -17,6 +17,11 @@ export default {
controllerAs: 'vm'
}
},
data: {
activityStream: true,
activityStreamTarget: 'o_auth2_access_token',
noActivityStreamID: true
},
searchPrefix: 'token',
params: {
token_search: {

3
awx/ui/client/src/activity-stream/get-target-title.factory.js
View File

@ -46,6 +46,9 @@ export default function GetTargetTitle(i18n) {
case 'o_auth2_application':
rtnTitle = i18n._('APPLICATIONS');
break;
case 'o_auth2_access_token':
rtnTitle = i18n._('TOKENS');
break;
}
return rtnTitle;

1
awx/ui/client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js
View File

@ -22,6 +22,7 @@ export default ['templateUrl', 'i18n', function(templateUrl, i18n) {
$scope.options = [
{label: i18n._('All Activity'), value: 'dashboard'},
{label: i18n._('Applications'), value: 'o_auth2_application'},
{label: i18n._('Tokens'), value: 'o_auth2_access_token'},
{label: i18n._('Credentials'), value: 'credential'},
{label: i18n._('Hosts'), value: 'host'},
{label: i18n._('Inventories'), value: 'inventory'},

4
awx/ui/client/src/bread-crumb/bread-crumb.directive.js
View File

@ -97,7 +97,7 @@ export default
order_by: '-timestamp',
page_size: '20',
};
if (streamConfig.activityStreamTarget && streamConfig.activityStreamId) {
if (streamConfig.activityStreamTarget && streamConfig.activityStreamId && !streamConfig.noActivityStreamID) {
stateGoParams.activity_search[streamConfig.activityStreamTarget] = $state.params[streamConfig.activityStreamId];
}
}
@ -107,7 +107,7 @@ export default
page_size: '20',
};
}
if(streamConfig.activityStreamId) {
if(streamConfig.activityStreamId && !streamConfig.noActivityStreamID) {
stateGoParams.id = $state.params[streamConfig.activityStreamId];
}
if(stateGoParams.target === "custom_inventory_script"){