diff options
| author | Michael Abashian <mabashian@users.noreply.github.com> | 2017-08-10 14:40:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-10 14:40:29 +0200 |
| commit | 308acc4bc9fda5436d312f38208dd61c8fc58eb6 (patch) | |
| tree | 777beef0b0e33143d7d275ca3395f939ad12b56a | |
| parent | Merge pull request #232 from mabashian/7410-inv-permissions (diff) | |
| parent | Added activity stream link to credentials (diff) | |
| download | awx-308acc4bc9fda5436d312f38208dd61c8fc58eb6.tar.xz awx-308acc4bc9fda5436d312f38208dd61c8fc58eb6.zip | |
Merge pull request #233 from mabashian/7404-credentials-activity
Added activity stream link to credentials
| -rw-r--r-- | awx/ui/client/features/credentials/index.js | 9 | ||||
| -rw-r--r-- | awx/ui/client/features/credentials/legacy.credentials.js | 10 |
2 files changed, 16 insertions, 3 deletions
diff --git a/awx/ui/client/features/credentials/index.js b/awx/ui/client/features/credentials/index.js index 9e0662cdcd..c11dc3e1d6 100644 --- a/awx/ui/client/features/credentials/index.js +++ b/awx/ui/client/features/credentials/index.js @@ -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'), diff --git a/awx/ui/client/features/credentials/legacy.credentials.js b/awx/ui/client/features/credentials/legacy.credentials.js index c76bd63e3b..3025be90ac 100644 --- a/awx/ui/client/features/credentials/legacy.credentials.js +++ b/awx/ui/client/features/credentials/legacy.credentials.js @@ -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': |