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

Merge pull request #233 from mabashian/7404-credentials-activity

Browse Source 
Added activity stream link to credentials
This commit is contained in:
Michael Abashian 2017-08-10 08:40:29 -04:00 committed by GitHub
commit 308acc4bc9
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
awx/ui/client/features/credentials/index.js
View File

@ -61,6 +61,10 @@ function CredentialsConfig ($stateExtenderProvider, legacyProvider, pathProvider
ncyBreadcrumb: {
label: strings.get('state.ADD_BREADCRUMB_LABEL')
},
data: {
activityStream: true,
activityStreamTarget: 'credential'
},
views: {
'add@credentials': {
templateUrl: path.getViewPath('credentials/add-edit-credentials'),
@ -79,6 +83,11 @@ function CredentialsConfig ($stateExtenderProvider, legacyProvider, pathProvider
ncyBreadcrumb: {
label: strings.get('state.EDIT_BREADCRUMB_LABEL')
},
data: {
activityStream: true,
activityStreamTarget: 'credential',
activityStreamId: 'credential_id'
},
views: {
'edit@credentials': {
templateUrl: path.getViewPath('credentials/add-edit-credentials'),

10
awx/ui/client/features/credentials/legacy.credentials.js
View File

@ -13,6 +13,10 @@ function LegacyCredentialsService (pathService) {
parent: 'setup',
label: N_('CREDENTIALS')
},
data: {
activityStream: true,
activityStreamTarget: 'credential'
},
views: {
'@': {
templateUrl: pathService.getViewPath('credentials/index')
@ -245,7 +249,7 @@ function LegacyCredentialsService (pathService) {
Dataset: ['ListDefinition', 'QuerySet', '$stateParams', 'GetBasePath',
(list, qs, $stateParams, GetBasePath) => {
return qs.search(
GetBasePath('organizations'),
GetBasePath('organizations'),
$stateParams[`${list.iterator}_search`]
);
}
@ -288,7 +292,7 @@ function LegacyCredentialsService (pathService) {
Dataset: ['ListDefinition', 'QuerySet', '$stateParams', 'GetBasePath',
(list, qs, $stateParams, GetBasePath) => {
return qs.search(
GetBasePath('credential_types'),
GetBasePath('credential_types'),
$stateParams[`${list.iterator}_search`]
);
}
@ -304,7 +308,7 @@ function LegacyCredentialsService (pathService) {
};
this.getStateConfiguration = (name) => {
switch (name) {
switch (name) {
case 'list':
return this.list;
case 'edit-permissions':