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

update app activity stream target to o_auth2_application

Browse Source
This commit is contained in:
John Mitchell
2018-04-27 11:37:17 -04:00
parent f99792e604
commit 6ab64590d7
4 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,7 +62,7 @@ function ApplicationsRun ($stateExtender, strings) {
}, },
data: { data: {
activityStream: true, activityStream: true,
activityStreamTarget: 'application' activityStreamTarget: 'o_auth2_application'
}, },
views: { views: {
'@': { '@': {
@@ -110,7 +110,7 @@ function ApplicationsRun ($stateExtender, strings) {
}, },
data: { data: {
activityStream: true, activityStream: true,
activityStreamTarget: 'application' activityStreamTarget: 'o_auth2_application'
}, },
views: { views: {
'add@applications': { 'add@applications': {
@@ -132,7 +132,7 @@ function ApplicationsRun ($stateExtender, strings) {
}, },
data: { data: {
activityStream: true, activityStream: true,
activityStreamTarget: 'application', activityStreamTarget: 'o_auth2_application',
activityStreamId: 'application_id' activityStreamId: 'application_id'
}, },
views: { views: {
@@ -262,8 +262,7 @@ function ApplicationsRun ($stateExtender, strings) {
}, },
data: { data: {
activityStream: true, activityStream: true,
// TODO: double-check activity stream works activityStreamTarget: 'o_auth2_application'
activityStreamTarget: 'application'
}, },
views: { views: {
'userList@applications.edit': { 'userList@applications.edit': {

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

@@ -43,7 +43,7 @@ export default function GetTargetTitle(i18n) {
case 'template': case 'template':
rtnTitle = i18n._('TEMPLATES'); rtnTitle = i18n._('TEMPLATES');
break; break;
case 'application': case 'o_auth2_application':
rtnTitle = i18n._('APPLICATIONS'); rtnTitle = i18n._('APPLICATIONS');
break; break;
} }

2
awx/ui/client/src/activity-stream/model-to-base-path-key.factory.js
View File

@@ -18,7 +18,7 @@ export default function ModelToBasePathKey() {
var basePathKey; var basePathKey;
switch(model) { switch(model) {
case 'application': case 'o_auth2_application':
basePathKey = 'applications'; basePathKey = 'applications';
break; break;
case 'project': case 'project':

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

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