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

Added activity stream link to credentials
This commit is contained in:
Michael Abashian
2017-08-10 08:40:29 -04:00
committed by GitHub
2 changed files with 16 additions and 3 deletions

View File

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

View File

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